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 03d879e903..f81aa20a4b 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
@@ -666,13 +666,13 @@ public class PlayerView extends FrameLayout {
    * Sets whether a buffering spinner is displayed when the player is in the buffering state. The
    * buffering spinner is not displayed by default.
    *
-   * Deprecated, use {@link #setShowBuffering(int)}
+   * @deprecated Use {@link #setShowBuffering(int)}
    *
    * @param showBuffering Whether the buffering icon is displayed
    */
   @Deprecated
   public void setShowBuffering(boolean showBuffering) {
-    setShowBuffering(showBuffering ? SHOW_BUFFERING_ALWAYS : SHOW_BUFFERING_NEVER);
+    setShowBuffering(showBuffering ? SHOW_BUFFERING_WHEN_PLAYING : SHOW_BUFFERING_NEVER);
   }
 
   /**
@@ -683,7 +683,7 @@ public class PlayerView extends FrameLayout {
    * <li>{@link #SHOW_BUFFERING_ALWAYS} displayed always when buffering
    * <li>{@link #SHOW_BUFFERING_NEVER} not displayed at all
    * <li>{@link #SHOW_BUFFERING_WHEN_PLAYING} displayed only when playing and buffering
-   * </p></ul>
+   * </ul></p>
    *
    * @param showBuffering Buffering strategy that defines when the buffering icon is displayed
    */
diff --git a/library/ui/src/main/res/values/attrs.xml b/library/ui/src/main/res/values/attrs.xml
index 35ad304bd3..89f873edf7 100644
--- a/library/ui/src/main/res/values/attrs.xml
+++ b/library/ui/src/main/res/values/attrs.xml
@@ -52,9 +52,9 @@
     <attr name="hide_during_ads" format="boolean"/>
     <attr name="auto_show" format="boolean"/>
     <attr name="show_buffering" format="enum">
-      <enum name="show_buffering_never" value="0"/>
-      <enum name="show_buffering_always" value="1"/>
-      <enum name="show_buffering_when_playing" value="2"/>
+      <enum name="never" value="0"/>
+      <enum name="always" value="1"/>
+      <enum name="when_playing" value="2"/>
     </attr>
     <attr name="keep_content_on_player_reset" format="boolean"/>
     <attr name="resize_mode"/>