diff --git a/docs/ui-components.md b/docs/ui-components.md
index c56107eae78..a9d80c04036 100644
--- a/docs/ui-components.md
+++ b/docs/ui-components.md
@@ -190,14 +190,15 @@ Note that overriding these drawables will also affect the appearance of
 All of the view components inflate their layouts from corresponding layout
 files, which are specified in their Javadoc. For example when a
 `PlayerControlView` is instantiated, it inflates its layout from
-`exo_player_control_view.xml`. To customize these layouts, an application can
-define layout files with the same names in its own `res/layout*` directories.
-These layout files will override the ones provided by the ExoPlayer library.
+`exo_player_control_view.xml`. To customize these layouts, an application
+can define layout files with the same names in its own `res/layout*`
+directories. These layout files will override the ones provided by the ExoPlayer
+library.
 
 As an example, suppose we want our playback controls to consist of only a
 play/pause button positioned in the center of the view. We can achieve this by
-creating an `exo_player_control_view.xml` file in the application’s `res/layout`
-directory, containing:
+creating an `exo_player_control_view.xml` file in the application’s
+`res/layout` directory, containing:
 
 ~~~
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index 30533dcd194..25557af745f 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -443,8 +443,8 @@ public PlayerView(Context context, @Nullable AttributeSet attrs, int defStyleAtt
           break;
       }
       surfaceView.setLayoutParams(params);
-      // We don't want surfaceView to be clickable separately to the PlayerView itself, but we do
-      // want to register as an OnClickListener so that surfaceView implementations can propagate
+      // We don't want surfaceView to be clickable separately to the PlayerView itself, but we
+      // do want to register as an OnClickListener so that surfaceView implementations can propagate
       // click events up to the PlayerView by calling their own performClick method.
       surfaceView.setOnClickListener(componentListener);
       surfaceView.setClickable(false);