diff --git a/docs/ad-insertion.md b/docs/ad-insertion.md
index 142de570a4..369b4427fc 100644
--- a/docs/ad-insertion.md
+++ b/docs/ad-insertion.md
@@ -64,9 +64,9 @@ Internally, `DefaultMediaSourceFactory` will wrap the content media source in an
`AdsLoader.Provider` and use it to insert ads as defined by the media item's ad
tag.
-ExoPlayer's `StyledPlayerView` and `PlayerView` UI components both implement
-`AdViewProvider`. The IMA extension provides an easy to use `AdsLoader`, as
-described below.
+ExoPlayer's `StyledPlayerView` and `PlayerView` UI components both
+implement `AdViewProvider`. The IMA extension provides an easy to use
+`AdsLoader`, as described below.
### Playlists with ads ###
@@ -123,8 +123,8 @@ VAST/VMAP ad tags in the sample list.
#### UI considerations ####
-`StyledPlayerView` and `PlayerView` hide controls during playback of ads by
-default, but apps can toggle this behavior by calling
+`StyledPlayerView` and `PlayerView` hide controls during playback of ads
+by default, but apps can toggle this behavior by calling
`setControllerHideDuringAds`, which is defined on both views. The IMA SDK will
show additional views on top of the player while an ad is playing (e.g., a 'more
info' link and a skip button, if applicable).
@@ -139,9 +139,9 @@ The IMA SDK may report whether ads are obscured by application provided views
rendered on top of the player. Apps that need to overlay views that are
essential for controlling playback must register them with the IMA SDK so that
they can be omitted from viewability calculations. When using `StyledPlayerView`
-or `PlayerView` as the `AdViewProvider`, they will automatically register their
-control overlays. Apps that use a custom player UI must register overlay views
-by returning them from `AdViewProvider.getAdOverlayInfos`.
+or `PlayerView` as the `AdViewProvider`, they will automatically register
+their control overlays. Apps that use a custom player UI must register overlay
+views by returning them from `AdViewProvider.getAdOverlayInfos`.
For more information about overlay views, see
[Open Measurement in the IMA SDK][].
diff --git a/docs/hls.md b/docs/hls.md
index 5633ad8976..fbea55ff4e 100644
--- a/docs/hls.md
+++ b/docs/hls.md
@@ -130,7 +130,6 @@ The following guidelines apply specifically for live streams:
[HlsMediaSource]: {{ site.exo_sdk }}/source/hls/HlsMediaSource.html
[HTTP Live Streaming]: https://tools.ietf.org/html/rfc8216
-[PlayerView]: {{ site.exo_sdk }}/ui/PlayerView.html
[UI components]: {{ site.baseurl }}/ui-components.html
[Customization page]: {{ site.baseurl }}/customization.html
[Medium post about HLS playback in ExoPlayer]: https://medium.com/google-exoplayer/hls-playback-in-exoplayer-a33959a47be7
diff --git a/extensions/av1/README.md b/extensions/av1/README.md
index f2a31dcbf1..b5d16dca8f 100644
--- a/extensions/av1/README.md
+++ b/extensions/av1/README.md
@@ -112,20 +112,20 @@ gets from the libgav1 decoder:
* GL rendering using GL shader for color space conversion
- * If you are using `ExoPlayer` with `PlayerView` or `StyledPlayerView`,
- enable this option by setting `surface_type` of view to be
- `video_decoder_gl_surface_view`.
+ * If you are using `ExoPlayer` with `PlayerView` or
+ `StyledPlayerView`, enable this option by setting `surface_type` of view
+ to be `video_decoder_gl_surface_view`.
* Otherwise, enable this option by sending `Libgav1VideoRenderer` a
- message of type `Renderer.MSG_SET_VIDEO_OUTPUT`
- with an instance of `VideoDecoderOutputBufferRenderer` as its object.
+ message of type `Renderer.MSG_SET_VIDEO_OUTPUT` with an instance of
+ `VideoDecoderOutputBufferRenderer` as its object.
`VideoDecoderGLSurfaceView` is the concrete
`VideoDecoderOutputBufferRenderer` implementation used by
- `(Styled)PlayerView`.
+ `PlayerView` and `StyledPlayerView`.
* Native rendering using `ANativeWindow`
- * If you are using `ExoPlayer` with `PlayerView` or `StyledPlayerView`,
- this option is enabled by default.
+ * If you are using `ExoPlayer` with `PlayerView` or
+ `StyledPlayerView`, this option is enabled by default.
* Otherwise, enable this option by sending `Libgav1VideoRenderer` a
message of type `Renderer.MSG_SET_VIDEO_OUTPUT` with an instance of
`SurfaceView` as its object.
diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md
index 384064d68d..2e471ca118 100644
--- a/extensions/vp9/README.md
+++ b/extensions/vp9/README.md
@@ -125,20 +125,20 @@ gets from the libvpx decoder:
* GL rendering using GL shader for color space conversion
- * If you are using `ExoPlayer` with `PlayerView` or `StyledPlayerView`,
- enable this option by setting `surface_type` of view to be
- `video_decoder_gl_surface_view`.
+ * If you are using `ExoPlayer` with `PlayerView` or
+ `StyledPlayerView`, enable this option by setting `surface_type` of view
+ to be `video_decoder_gl_surface_view`.
* Otherwise, enable this option by sending `LibvpxVideoRenderer` a message
- of type `Renderer.MSG_SET_VIDEO_OUTPUT` with an
- instance of `VideoDecoderOutputBufferRenderer` as its object.
+ of type `Renderer.MSG_SET_VIDEO_OUTPUT` with an instance of
+ `VideoDecoderOutputBufferRenderer` as its object.
`VideoDecoderGLSurfaceView` is the concrete
`VideoDecoderOutputBufferRenderer` implementation used by
- `(Styled)PlayerView`.
+ `PlayerView` and `StyledPlayerView`.
* Native rendering using `ANativeWindow`
- * If you are using `ExoPlayer` with `PlayerView` or `StyledPlayerView`,
- this option is enabled by default.
+ * If you are using `ExoPlayer` with `PlayerView` or
+ `StyledPlayerView`, this option is enabled by default.
* Otherwise, enable this option by sending `LibvpxVideoRenderer` a message
of type `Renderer.MSG_SET_VIDEO_OUTPUT` with an instance of
`SurfaceView` as its object.
diff --git a/library/ui/src/main/res/values/attrs.xml b/library/ui/src/main/res/values/attrs.xml
index a0547b53fb..da1eea4134 100644
--- a/library/ui/src/main/res/values/attrs.xml
+++ b/library/ui/src/main/res/values/attrs.xml
@@ -105,7 +105,7 @@
-
+