From f77077a84c404510f4cc2961b533b4e266bfcf0b Mon Sep 17 00:00:00 2001 From: olly Date: Thu, 29 Mar 2018 09:37:02 -0700 Subject: [PATCH] Don't call getLayoutDirection before API level 17 Weirdly, the Android Javadoc indicates that it returns something before the API level on which the same Javadoc states it was added. In any case, we can simply not call the method to avoid the warning, since we only use the value if the API level is at least 23 anyway. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=190941776 --- .../com/google/android/exoplayer2/ui/DefaultTimeBar.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java index 048bb3ffff..a15ee1b88e 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java @@ -250,7 +250,7 @@ public class DefaultTimeBar extends View implements TimeBar { try { scrubberDrawable = a.getDrawable(R.styleable.DefaultTimeBar_scrubber_drawable); if (scrubberDrawable != null) { - setDrawableLayoutDirection(scrubberDrawable, getLayoutDirection()); + setDrawableLayoutDirection(scrubberDrawable); defaultTouchTargetHeight = Math.max(scrubberDrawable.getMinimumHeight(), defaultTouchTargetHeight); } @@ -747,8 +747,8 @@ public class DefaultTimeBar extends View implements TimeBar { return true; } - private static int dpToPx(DisplayMetrics displayMetrics, int dps) { - return (int) (dps * displayMetrics.density + 0.5f); + private boolean setDrawableLayoutDirection(Drawable drawable) { + return Util.SDK_INT >= 23 && setDrawableLayoutDirection(drawable, getLayoutDirection()); } private static boolean setDrawableLayoutDirection(Drawable drawable, int layoutDirection) { @@ -771,4 +771,7 @@ public class DefaultTimeBar extends View implements TimeBar { return 0x33000000 | (adMarkerColor & 0x00FFFFFF); } + private static int dpToPx(DisplayMetrics displayMetrics, int dps) { + return (int) (dps * displayMetrics.density + 0.5f); + } }