Migrate to androidx

Issue: #5489
PiperOrigin-RevId: 234507428

Add missing annotation dependency

Issue: #5489
PiperOrigin-RevId: 234566177

demos/cast/build.gradle

@@ -67,10 +67,10 @@ dependencies {
  implementation project(modulePrefix + 'library-smoothstreaming')
  implementation project(modulePrefix + 'library-ui')
  implementation project(modulePrefix + 'extension-cast')
- implementation 'com.android.support:design:' + supportLibraryVersion
- implementation 'com.android.support:support-v4:' + supportLibraryVersion
- implementation 'com.android.support:appcompat-v7:' + supportLibraryVersion
- implementation 'com.android.support:recyclerview-v7:' + supportLibraryVersion
+ implementation 'com.google.android.material:material:1.0.0'
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+ implementation 'androidx.appcompat:appcompat:1.0.2'
+ implementation 'androidx.recyclerview:recyclerview:1.0.0'
 }
 
 apply plugin: 'com.google.android.gms.strict-version-matcher-plugin'

demos/cast/proguard-rules.txt

@@ -1,6 +1,6 @@
 # Proguard rules specific to the Cast demo app.
 
 # Accessed via menu.xml
--keep class android.support.v7.app.MediaRouteActionProvider {
+-keep class androidx.mediarouter.app.MediaRouteActionProvider {
  *;
 }

demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DefaultReceiverPlayerManager.java

@@ -17,7 +17,7 @@
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.KeyEvent;
 import android.view.View;
 import com.google.android.exoplayer2.C;

demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java

@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.castdemo;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.util.ArrayList;

demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java

@@ -17,13 +17,13 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.graphics.ColorUtils;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.ViewHolder;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.core.graphics.ColorUtils;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;

demos/cast/src/main/res/layout/main_activity.xml

@@ -31,14 +31,14 @@
  android:layout_height="0dp"
  android:layout_weight="1">
 
- <android.support.v7.widget.RecyclerView android:id="@+id/sample_list"
+ <androidx.recyclerview.widget.RecyclerView android:id="@+id/sample_list"
  android:choiceMode="singleChoice"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:scrollbars="vertical"
  android:fadeScrollbars="false"/>
 
- <android.support.design.widget.FloatingActionButton android:id="@+id/add_sample_button"
+ <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/add_sample_button"
  android:src="@drawable/ic_plus"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"

demos/cast/src/main/res/menu/menu.xml

@@ -19,7 +19,7 @@
  <item
  android:id="@+id/media_route_menu_item"
  android:title="@string/media_route_menu_title"
- app:actionProviderClass="android.support.v7.app.MediaRouteActionProvider"
+ app:actionProviderClass="androidx.mediarouter.app.MediaRouteActionProvider"
  app:showAsAction="always" />
 
 </menu>

demos/ima/build.gradle

@@ -53,7 +53,7 @@ dependencies {
  implementation project(modulePrefix + 'library-hls')
  implementation project(modulePrefix + 'library-smoothstreaming')
  implementation project(modulePrefix + 'extension-ima')
- implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+ implementation 'androidx.annotation:annotation:1.0.1'
 }
 
 apply plugin: 'com.google.android.gms.strict-version-matcher-plugin'

demos/main/build.gradle

@@ -62,10 +62,10 @@ android {
 }
 
 dependencies {
- implementation 'com.android.support:support-annotations:' + supportLibraryVersion
- implementation 'com.android.support:support-core-ui:' + supportLibraryVersion
- implementation 'com.android.support:support-fragment:' + supportLibraryVersion
- implementation 'com.android.support:design:' + supportLibraryVersion
+ implementation 'androidx.annotation:annotation:1.0.1'
+ implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
+ implementation 'androidx.fragment:fragment:1.0.0'
+ implementation 'com.google.android.material:material:1.0.0'
  implementation project(modulePrefix + 'library-core')
  implementation project(modulePrefix + 'library-dash')
  implementation project(modulePrefix + 'library-hls')

demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java

@@ -20,8 +20,8 @@
 import android.net.Uri;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentManager;
 import android.widget.Toast;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.RenderersFactory;

demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java

@@ -19,9 +19,9 @@
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Pair;
 import android.view.KeyEvent;
 import android.view.View;

demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java

@@ -21,8 +21,8 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.JsonReader;
 import android.view.Menu;
 import android.view.MenuInflater;

demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java

@@ -19,14 +19,14 @@
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatDialog;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatDialog;
 import android.util.SparseArray;
 import android.util.TypedValue;
 import android.view.LayoutInflater;

demos/main/src/main/res/layout/track_selection_dialog.xml

@@ -17,16 +17,16 @@
  android:orientation="vertical"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
  android:id="@+id/track_selection_dialog_view_pager"
  android:layout_width="match_parent"
  android:layout_height="0dp"
  android:layout_weight="1">
- <android.support.design.widget.TabLayout
+ <com.google.android.material.tabs.TabLayout
  android:id="@+id/track_selection_dialog_tab_layout"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"/>
- </android.support.v4.view.ViewPager>
+ </androidx.viewpager.widget.ViewPager>
  <LinearLayout
  android:orientation="horizontal"
  android:layout_width="match_parent"

demos/main/src/main/res/menu/sample_chooser_menu.xml

@@ -13,13 +13,14 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
  <item android:id="@+id/prefer_extension_decoders"
- android:title="@string/prefer_extension_decoders"
- android:showAsAction="never"
- android:checkable="true"/>
+  android:title="@string/prefer_extension_decoders"
+  android:checkable="true"
+  app:showAsAction="never"/>
  <item android:id="@+id/random_abr"
- android:title="@string/random_abr"
- android:showAsAction="never"
- android:checkable="true"/>
+  android:title="@string/random_abr"
+  android:checkable="true"
+  app:showAsAction="never"/>
 </menu>

extensions/cast/build.gradle

@@ -32,24 +32,16 @@ android {
 
 dependencies {
  api 'com.google.android.gms:play-services-cast-framework:16.1.2'
- compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
- compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
+ implementation 'androidx.annotation:annotation:1.0.1'
  implementation project(modulePrefix + 'library-core')
  implementation project(modulePrefix + 'library-ui')
+ compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
+ compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
  testImplementation project(modulePrefix + 'testutils')
  testImplementation 'junit:junit:' + junitVersion
  testImplementation 'org.mockito:mockito-core:' + mockitoVersion
  testImplementation 'org.robolectric:robolectric:' + robolectricVersion
  testImplementation project(modulePrefix + 'testutils-robolectric')
- // These dependencies are necessary to force the supportLibraryVersion of
- // com.android.support:support-v4, com.android.support:appcompat-v7 and
- // com.android.support:mediarouter-v7 to be used. Else older versions are
- // used, for example via:
- // com.google.android.gms:play-services-cast-framework:15.0.1
- // |-- com.android.support:mediarouter-v7:26.1.0
- api 'com.android.support:support-v4:' + supportLibraryVersion
- api 'com.android.support:mediarouter-v7:' + supportLibraryVersion
- api 'com.android.support:recyclerview-v7:' + supportLibraryVersion
 }
 
 ext {

extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java

@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2.ext.cast;
 
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.BasePlayer;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;

extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java

@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.cast;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.SparseIntArray;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;

extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java

@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.ext.cast;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;

extensions/cronet/build.gradle

@@ -33,7 +33,7 @@ android {
 dependencies {
  api 'org.chromium.net:cronet-embedded:72.3626.96'
  implementation project(modulePrefix + 'library-core')
- implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+ implementation 'androidx.annotation:annotation:1.0.1'
  testImplementation project(modulePrefix + 'library')
  testImplementation project(modulePrefix + 'testutils-robolectric')
 }

extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java

@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.ext.cronet;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;

extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceFactory.java

@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.cronet;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
 import com.google.android.exoplayer2.upstream.HttpDataSource.BaseFactory;

extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java

@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.ext.cronet;
 
 import android.content.Context;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 import java.lang.annotation.Documented;

extensions/ffmpeg/build.gradle

@@ -38,7 +38,7 @@ android {
 
 dependencies {
  implementation project(modulePrefix + 'library-core')
- implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+ implementation 'androidx.annotation:annotation:1.0.1'
  compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
  testImplementation project(modulePrefix + 'testutils-robolectric')
  testImplementation 'junit:junit:' + junitVersion

extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java

@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.ext.ffmpeg;
 
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;

extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java

@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.ffmpeg;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;

extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java

@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.ffmpeg;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.util.LibraryLoader;

extensions/flac/build.gradle

@@ -39,7 +39,7 @@ android {
 
 dependencies {
  implementation project(modulePrefix + 'library-core')
- implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+ implementation 'androidx.annotation:annotation:1.0.1'
  androidTestImplementation project(modulePrefix + 'testutils')
  androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
  testImplementation project(modulePrefix + 'testutils-robolectric')

extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java

@@ -19,7 +19,7 @@
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.DefaultExtractorInput;

extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java

@@ -17,8 +17,8 @@
 
 import static com.google.android.exoplayer2.util.Util.getPcmEncoding;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.extractor.BinarySearchSeeker;

extensions/gvr/build.gradle

@@ -33,7 +33,7 @@ android {
 dependencies {
  implementation project(modulePrefix + 'library-core')
  implementation project(modulePrefix + 'library-ui')
- implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+ implementation 'androidx.annotation:annotation:1.0.1'
  api 'com.google.vr:sdk-base:1.190.0'
  compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
 }

extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java

@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.gvr;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.Format;