From 2d808010ee5b836ce7e067a36ec451316a3cd85b Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 23 Nov 2018 16:20:18 +0000 Subject: [PATCH] Ensure changes are reflected into attrs PiperOrigin-RevId: 222628386 --- .../google/android/exoplayer2/ui/PlayerView.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) 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 e429f5bfa0..310d04a064 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 @@ -241,11 +241,7 @@ import java.util.List; */ public class PlayerView extends FrameLayout { - private static final int SURFACE_TYPE_NONE = 0; - private static final int SURFACE_TYPE_SURFACE_VIEW = 1; - private static final int SURFACE_TYPE_TEXTURE_VIEW = 2; - private static final int SURFACE_TYPE_MONO360_VIEW = 3; - + // LINT.IfChange /** * Determines when the buffering view is shown. One of {@link #SHOW_BUFFERING_NEVER}, {@link * #SHOW_BUFFERING_WHEN_PLAYING} or {@link #SHOW_BUFFERING_ALWAYS}. @@ -266,6 +262,14 @@ public class PlayerView extends FrameLayout { * buffering} state. */ public static final int SHOW_BUFFERING_ALWAYS = 2; + // LINT.ThenChange(../../../../../../res/values/attrs.xml) + + // LINT.IfChange + private static final int SURFACE_TYPE_NONE = 0; + private static final int SURFACE_TYPE_SURFACE_VIEW = 1; + private static final int SURFACE_TYPE_TEXTURE_VIEW = 2; + private static final int SURFACE_TYPE_MONO360_VIEW = 3; + // LINT.ThenChange(../../../../../../res/values/attrs.xml) private final AspectRatioFrameLayout contentFrame; private final View shutterView;