From a21572f0dd665040e49db79b5fe912f5fcc92f7e Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 11 Feb 2019 18:04:02 +0000 Subject: [PATCH] Fix minor issues and lint errors PiperOrigin-RevId: 233428556 --- demos/cast/build.gradle | 4 ++-- .../android/exoplayer2/castdemo/MainActivity.java | 7 +++++-- demos/cast/src/main/res/layout/main_activity.xml | 3 ++- demos/cast/src/main/res/values/strings.xml | 2 +- demos/ima/build.gradle | 4 ++-- demos/main/build.gradle | 5 +++-- demos/main/src/main/AndroidManifest.xml | 4 +++- extensions/cronet/build.gradle | 2 +- .../android/exoplayer2/ext/gvr/GvrPlayerActivity.java | 1 - extensions/gvr/src/main/res/layout/vr_ui.xml | 9 +++++---- extensions/ima/build.gradle | 4 ++-- extensions/leanback/build.gradle | 2 +- .../android/exoplayer2/extractor/ogg/OggPacket.java | 2 -- .../android/exoplayer2/text/subrip/SubripDecoder.java | 5 ++++- .../exoplayer2/upstream/cache/CachedContentIndex.java | 2 ++ .../android/exoplayer2/upstream/cache/SimpleCache.java | 4 ++-- .../exoplayer2/upstream/cache/SimpleCacheSpanTest.java | 10 +++++----- .../com/google/android/exoplayer2/ui/PlayerView.java | 1 - .../android/exoplayer2/testutil/HostActivity.java | 5 +++-- 19 files changed, 43 insertions(+), 33 deletions(-) diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle index c4fb23248f..79cf3d9a0a 100644 --- a/demos/cast/build.gradle +++ b/demos/cast/build.gradle @@ -44,8 +44,8 @@ android { } lintOptions { - // The demo app does not have translations. - disable 'MissingTranslation' + // The demo app isn't indexed and doesn't have translations. + disable 'GoogleAppIndexingWarning','MissingTranslation' } } diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java index 6e36427c5a..5ecfaec78e 100644 --- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java +++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java @@ -150,8 +150,11 @@ public class MainActivity extends AppCompatActivity @Override public void onClick(View view) { - new AlertDialog.Builder(this).setTitle(R.string.sample_list_dialog_title) - .setView(buildSampleListView()).setPositiveButton(android.R.string.ok, null).create() + new AlertDialog.Builder(this) + .setTitle(R.string.add_samples) + .setView(buildSampleListView()) + .setPositiveButton(android.R.string.ok, null) + .create() .show(); } diff --git a/demos/cast/src/main/res/layout/main_activity.xml b/demos/cast/src/main/res/layout/main_activity.xml index 01e48cdea7..89b6b1868d 100644 --- a/demos/cast/src/main/res/layout/main_activity.xml +++ b/demos/cast/src/main/res/layout/main_activity.xml @@ -40,7 +40,8 @@ android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" - android:padding="30dp"/> + android:padding="30dp" + android:contentDescription="@string/add_samples"/> Cast - Add samples + Add samples Failed to get Cast context. Try updating Google Play Services and restart the app. diff --git a/demos/ima/build.gradle b/demos/ima/build.gradle index 30288845b3..490967add3 100644 --- a/demos/ima/build.gradle +++ b/demos/ima/build.gradle @@ -41,8 +41,8 @@ android { } lintOptions { - // The demo app does not have translations. - disable 'MissingTranslation' + // The demo app isn't indexed and doesn't have translations. + disable 'GoogleAppIndexingWarning','MissingTranslation' } } diff --git a/demos/main/build.gradle b/demos/main/build.gradle index 206c85cd17..440dc864d6 100644 --- a/demos/main/build.gradle +++ b/demos/main/build.gradle @@ -44,8 +44,9 @@ android { } lintOptions { - // The demo app does not have translations. - disable 'MissingTranslation' + // The demo app isn't indexed, doesn't have translations, and has a + // banner for AndroidTV that's only in xhdpi density. + disable 'GoogleAppIndexingWarning','MissingTranslation','IconDensities' } flavorDimensions "extensions" diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml index e80e37688d..1f013f5add 100644 --- a/demos/main/src/main/AndroidManifest.xml +++ b/demos/main/src/main/AndroidManifest.xml @@ -15,6 +15,7 @@ --> @@ -33,7 +34,8 @@ android:banner="@drawable/ic_banner" android:largeHeap="true" android:allowBackup="false" - android:name="com.google.android.exoplayer2.demo.DemoApplication"> + android:name="com.google.android.exoplayer2.demo.DemoApplication" + tools:ignore="UnusedAttribute"> - + android:background="@android:color/black" + android:orientation="horizontal" + tools:ignore="Overdraw"> spans = index.get(key).getSpans(); assertWithMessage("upgradeOldFiles() shouldn't add any spans.").that(spans.isEmpty()).isTrue(); - HashMap cachedPositions = new HashMap<>(); + LongSparseArray cachedPositions = new LongSparseArray<>(); for (File file : files) { SimpleCacheSpan cacheSpan = SimpleCacheSpan.createCacheEntry(file, file.length(), index); if (cacheSpan != null) { @@ -121,9 +121,9 @@ public class SimpleCacheSpanTest { } } - assertThat(cachedPositions.get((long) 0)).isEqualTo(1); - assertThat(cachedPositions.get((long) 1)).isEqualTo(2); - assertThat(cachedPositions.get((long) 5)).isEqualTo(6); + assertThat(cachedPositions.get(0)).isEqualTo(1); + assertThat(cachedPositions.get(1)).isEqualTo(2); + assertThat(cachedPositions.get(5)).isEqualTo(6); } private static void createTestFile(File file, long length) throws IOException { 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 00ffaa8057..ccc204515c 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 @@ -403,7 +403,6 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider surfaceView = new TextureView(context); break; case SURFACE_TYPE_MONO360_VIEW: - Assertions.checkState(Util.SDK_INT >= 15); SphericalSurfaceView sphericalSurfaceView = new SphericalSurfaceView(context); sphericalSurfaceView.setSurfaceListener(componentListener); sphericalSurfaceView.setSingleTapListener(componentListener); diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java index 8f2b977f08..73e8ac4f3e 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java @@ -80,6 +80,7 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba } private static final String TAG = "HostActivity"; + private static final String LOCK_TAG = "ExoPlayerTestUtil:" + TAG; private static final long START_TIMEOUT_MS = 5000; private WakeLock wakeLock; @@ -175,10 +176,10 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba public void onStart() { Context appContext = getApplicationContext(); WifiManager wifiManager = (WifiManager) appContext.getSystemService(Context.WIFI_SERVICE); - wifiLock = wifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, TAG); + wifiLock = wifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, LOCK_TAG); wifiLock.acquire(); PowerManager powerManager = (PowerManager) appContext.getSystemService(Context.POWER_SERVICE); - wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG); + wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, LOCK_TAG); wakeLock.acquire(); super.onStart(); }