Bug 1553459 - Migrate to AndroidX r=geckoview-reviewers,agi

Differential Revision: https://phabricator.services.mozilla.com/D90711

build.gradle

@@ -72,18 +72,9 @@ buildscript {
     }
 
     ext.kotlin_version = '1.3.41'
-    ext.support_library_version = '28.0.0'
-    ext.jacoco_version = '0.8.1'
-    ext.lifecycle_library_version = '1.1.1'
-
-    if (gradle.mozconfig.substs.MOZ_ANDROID_GOOGLE_PLAY_SERVICES) {
-        ext.google_play_services_version = '15.0.1'
-        ext.google_play_services_cast_version = '16.0.0'
-        ext.google_play_services_fido_version = '17.0.0'
-    }
 
     dependencies {
-        classpath 'org.mozilla.apilint:apilint:0.3.0'
+        classpath 'org.mozilla.apilint:apilint:0.3.1'
         classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
         classpath 'org.apache.commons:commons-exec:1.3'

gradle.properties

@@ -1,3 +1,4 @@
 org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xmx6656M
+android.useAndroidX=true

media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/Camera1Enumerator.java

@@ -11,7 +11,7 @@
 package org.webrtc;
 
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 import org.webrtc.CameraEnumerationAndroid.CaptureFormat;

media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/Camera2Capturer.java

@@ -13,7 +13,7 @@ package org.webrtc;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.hardware.camera2.CameraManager;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 @TargetApi(21)
 public class Camera2Capturer extends CameraCapturer {

media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/Camera2Enumerator.java

@@ -20,7 +20,7 @@ import android.hardware.camera2.CameraMetadata;
 import android.hardware.camera2.params.StreamConfigurationMap;
 import android.os.Build;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AndroidException;
 import android.util.Range;
 import java.util.ArrayList;

media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/EglBase.java

@@ -11,7 +11,7 @@
 package org.webrtc;
 
 import android.graphics.SurfaceTexture;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import java.util.ArrayList;
 import javax.microedition.khronos.egl.EGL10;

media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/JavaI420Buffer.java

@@ -10,7 +10,7 @@
 
 package org.webrtc;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.nio.ByteBuffer;
 import org.webrtc.VideoFrame.I420Buffer;
 

media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/SurfaceTextureHelper.java

@@ -17,7 +17,7 @@ import android.opengl.GLES20;
 import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.util.concurrent.Callable;
 import org.webrtc.EglBase.Context;
 import org.webrtc.TextureBufferImpl.RefCountMonitor;

media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/TextureBufferImpl.java

@@ -12,7 +12,7 @@ package org.webrtc;
 
 import android.graphics.Matrix;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Android texture buffer that glues together the necessary information together with a generic

media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/VideoFrameDrawer.java

@@ -13,7 +13,7 @@ package org.webrtc;
 import android.graphics.Matrix;
 import android.graphics.Point;
 import android.opengl.GLES20;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.nio.ByteBuffer;
 
 /**

media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/Camera2Session.java

@@ -22,7 +22,7 @@ import android.hardware.camera2.CameraMetadata;
 import android.hardware.camera2.CaptureFailure;
 import android.hardware.camera2.CaptureRequest;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Range;
 import android.view.Surface;
 import java.util.Arrays;

media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/CameraCapturer.java

@@ -13,7 +13,7 @@ package org.webrtc;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.util.Arrays;
 
 @SuppressWarnings("deprecation")

media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/EglBase10Impl.java

@@ -13,7 +13,7 @@ package org.webrtc;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.SurfaceTexture;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import javax.microedition.khronos.egl.EGL10;

media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/EglBase14Impl.java

@@ -19,9 +19,8 @@ import android.opengl.EGLDisplay;
 import android.opengl.EGLExt;
 import android.opengl.EGLSurface;
 import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Surface;
-import org.webrtc.EglBase;
 
 /**
  * Holds EGL state and utility methods for handling an EGL14 EGLContext, an EGLDisplay,

media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/GlGenericDrawer.java

@@ -12,11 +12,8 @@ package org.webrtc;
 
 import android.opengl.GLES11Ext;
 import android.opengl.GLES20;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.nio.FloatBuffer;
-import org.webrtc.GlShader;
-import org.webrtc.GlUtil;
-import org.webrtc.RendererCommon;
 
 /**
  * Helper class to implement an instance of RendererCommon.GlDrawer that can accept multiple input

media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/NV21Buffer.java

@@ -10,7 +10,7 @@
 
 package org.webrtc;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.nio.ByteBuffer;
 
 public class NV21Buffer implements VideoFrame.Buffer {

media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/RefCountDelegate.java

@@ -10,7 +10,7 @@
 
 package org.webrtc;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**

mobile/android/config/proguard/proguard.cfg

@@ -19,8 +19,6 @@
 -keep public class * extends org.mozilla.gecko.fxa.sync.FxAccountSyncAdapter
 -keep class org.mozilla.gecko.fxa.sync.FxAccountSyncAdapter
 
--keep public class * extends android.support.v4.app.Fragment
-
 # Preserve all native method names and the names of their classes.
 -keepclasseswithmembernames class * {
     native <methods>;
@@ -43,13 +41,6 @@
    *** get*();
 }
 
-# Keep setters in support Fragment so that Robocop tests work,
-# specifically testBrowserSearchVisibility.
--keepclassmembers public class * extends android.support.v4.app.Fragment {
-   void set*(***);
-   *** get*();
-}
-
 # Preserve enums. (For awful reasons, the runtime accesses them using introspection...)
 -keepclassmembers enum * {
      *;
@@ -108,11 +99,6 @@
 
 -dontnote com.android.vending.licensing.ILicensingService
 
-# The Android Compatibility library references some classes that may not be
-# present in all versions of the API, but we know that's ok.
-
--dontwarn android.support.**
-
 # Preserve all native method names and the names of their classes.
 
 -keepclasseswithmembernames class * {
@@ -161,10 +147,6 @@
 
 -include "play-services-keeps.cfg"
 
-# Don't print spurious warnings from the support library.
-# See: http://stackoverflow.com/questions/22441366/note-android-support-v4-text-icucompatics-cant-find-dynamically-referenced-cl
--dontnote android.support.**
-
 # Don't warn when classes referenced by JaCoCo are missing when running the build from android-dependencies.
 -dontwarn java.lang.instrument.**
 -dontwarn java.lang.management.**

mobile/android/examples/messaging_example/app/build.gradle

@@ -42,9 +42,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.android.support:support-annotations:$support_library_version"
-    implementation "com.android.support:appcompat-v7:$support_library_version"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation "androidx.annotation:annotation:1.0.0"
+    implementation "androidx.appcompat:appcompat:1.0.0"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
     // Replace this with implementation "org.mozilla.geckoview:geckoview-${geckoviewChannel}:${geckoviewVersion}"
     implementation project(path: ':geckoview')

mobile/android/examples/messaging_example/app/src/main/java/org/mozilla/geckoview/example/messaging/MainActivity.java

@@ -1,8 +1,8 @@
 package org.mozilla.geckoview.example.messaging;
 
-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.os.Bundle;
 import android.util.Log;
 

mobile/android/examples/messaging_example/app/src/main/res/layout/activity_main.xml

@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -15,4 +15,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

mobile/android/examples/port_messaging_example/app/build.gradle

@@ -42,9 +42,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.android.support:support-annotations:$support_library_version"
-    implementation "com.android.support:appcompat-v7:$support_library_version"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation "androidx.annotation:annotation:1.0.0"
+    implementation "androidx.appcompat:appcompat:1.0.0"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
     implementation project(path: ':geckoview')
 }

mobile/android/examples/port_messaging_example/app/src/main/java/org/mozilla/geckoview/example/messaging/MainActivity.java

@@ -1,8 +1,8 @@
 package org.mozilla.geckoview.example.messaging;
 
-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.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;

mobile/android/examples/port_messaging_example/app/src/main/res/layout/activity_main.xml

@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -15,4 +15,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

mobile/android/geckoview/api.txt

@@ -14,10 +14,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.AnyThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
 import android.util.AttributeSet;
 import android.util.SparseArray;
 import android.view.ActionMode;
@@ -35,6 +31,10 @@ import android.view.inputmethod.ExtractedText;
 import android.view.inputmethod.ExtractedTextRequest;
 import android.view.inputmethod.InputConnection;
 import android.widget.FrameLayout;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import java.io.File;
 import java.io.InputStream;
 import java.lang.Boolean;

mobile/android/geckoview/build.gradle

@@ -213,18 +213,18 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
 
 dependencies {
     // For exoplayer.
-    implementation "androidx.annotation:annotation:1.1.0"
     compileOnly "com.google.code.findbugs:jsr305:3.0.2"
     compileOnly "org.checkerframework:checker-compat-qual:2.5.0"
     compileOnly "org.checkerframework:checker-qual:2.5.0"
     compileOnly "org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.70"
 
-    implementation "com.android.support:support-v4:$support_library_version"
-    implementation "com.android.support:palette-v7:$support_library_version"
+    implementation "androidx.annotation:annotation:1.1.0"
+    implementation "androidx.legacy:legacy-support-v4:1.0.0"
+    implementation "androidx.palette:palette:1.0.0"
     implementation "org.yaml:snakeyaml:1.24:android"
 
-    implementation "android.arch.lifecycle:extensions:$lifecycle_library_version"
-    implementation "android.arch.lifecycle:common-java8:$lifecycle_library_version"
+    implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.0.0"
 
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     testImplementation 'junit:junit:4.12'
@@ -238,8 +238,6 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 
-    androidTestImplementation "com.android.support:support-annotations:$support_library_version"
-
     androidTestImplementation 'com.koushikdutta.async:androidasync:2.+'
 }
 
@@ -556,6 +554,7 @@ apiLint {
     allowedPackages = [
         'java',
         'android',
+        'androidx',
         'org.json',
         'org.mozilla.geckoview',
     ]

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateMultipleSessionsTest.kt

@@ -19,7 +19,7 @@ import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.IgnoreCrash
 import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDisplay
 import org.mozilla.geckoview.test.util.Callbacks
 
-import android.support.annotation.AnyThread
+import androidx.annotation.AnyThread
 import androidx.test.filters.MediumTest
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import android.util.Pair

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateTest.kt

@@ -15,7 +15,7 @@ import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.IgnoreCrash
 import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDisplay
 import org.mozilla.geckoview.test.util.Callbacks
 
-import android.support.annotation.AnyThread
+import androidx.annotation.AnyThread
 import androidx.test.filters.MediumTest
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import android.view.Surface

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoViewTest.kt

@@ -3,7 +3,7 @@ package org.mozilla.geckoview.test
 import androidx.test.filters.LargeTest
 import androidx.test.rule.ActivityTestRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import android.support.v4.view.ViewCompat
+import androidx.core.view.ViewCompat
 import android.view.View
 
 import org.hamcrest.MatcherAssert.assertThat

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TestCrashHandler.java

@@ -13,8 +13,6 @@ import android.os.Looper;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
-import android.support.annotation.Nullable;
-import android.util.Log;
 
 import org.mozilla.geckoview.GeckoRuntime;
 import org.mozilla.geckoview.test.util.UiThreadUtils;

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TestRunnerActivity.java

@@ -5,7 +5,6 @@
 
 package org.mozilla.geckoview.test;
 
-import org.json.JSONObject;
 import org.mozilla.geckoview.AllowOrDeny;
 import org.mozilla.geckoview.GeckoDisplay;
 import org.mozilla.geckoview.GeckoResult;
@@ -23,16 +22,14 @@ import android.content.Intent;
 import android.graphics.SurfaceTexture;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Stack;
 
 public class TestRunnerActivity extends Activity {
     private static final String LOGTAG = "TestRunnerActivity";

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebPushUtils.java

@@ -6,8 +6,8 @@
 
 package org.mozilla.geckoview.test;
 
-import android.support.annotation.AnyThread;
-import android.support.annotation.Nullable;
+import androidx.annotation.AnyThread;
+import androidx.annotation.Nullable;
 import android.util.Base64;
 
 import java.math.BigInteger;
@@ -17,12 +17,10 @@ import java.security.KeyFactory;
 import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
 import java.security.interfaces.ECPublicKey;
-import java.security.spec.ECFieldFp;
 import java.security.spec.ECGenParameterSpec;
 import java.security.spec.ECParameterSpec;
 import java.security.spec.ECPoint;
 import java.security.spec.ECPublicKeySpec;
-import java.security.spec.EllipticCurve;
 import java.security.spec.InvalidKeySpecException;
 
 /**

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/rule/GeckoSessionTestRule.java

@@ -44,8 +44,8 @@ import android.app.Instrumentation;
 import android.graphics.Point;
 import android.graphics.SurfaceTexture;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.test.platform.app.InstrumentationRegistry;
 import android.util.Log;
 import android.util.Pair;

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/RuntimeCreator.java

@@ -8,9 +8,9 @@ import org.mozilla.geckoview.test.TestCrashHandler;
 
 import android.os.Looper;
 import android.os.Process;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import androidx.test.platform.app.InstrumentationRegistry;
 import android.util.Log;
 

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/UiThreadUtils.java

@@ -11,7 +11,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.os.MessageQueue;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/EventDispatcher.java

@@ -17,7 +17,7 @@ import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.geckoview.BuildConfig;
 
 import android.os.Handler;
-import android.support.annotation.AnyThread;
+import androidx.annotation.AnyThread;
 import android.util.Log;
 
 import java.util.ArrayDeque;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java

@@ -75,9 +75,9 @@ import android.os.Looper;
 import android.os.PowerManager;
 import android.os.Vibrator;
 import android.provider.Settings;
-import android.support.annotation.Nullable;
-import android.support.v4.content.res.ResourcesCompat;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.annotation.Nullable;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.collection.SimpleArrayMap;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEditableChild.java

@@ -12,7 +12,7 @@ import org.mozilla.gecko.util.ThreadUtils;
 import android.graphics.RectF;
 import android.os.IBinder;
 import android.os.RemoteException;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.KeyEvent;
 

mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoJavaSampler.java

@@ -8,8 +8,8 @@ package org.mozilla.gecko;
 import android.os.Looper;
 import android.os.SystemClock;
 import android.util.Log;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Queue;
 import java.util.concurrent.Executors;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoNetworkManager.java

@@ -24,8 +24,8 @@ import android.net.ConnectivityManager;
 import android.net.DhcpInfo;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.telephony.TelephonyManager;
 import android.text.format.Formatter;
 import android.util.Log;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfile.java

@@ -6,9 +6,9 @@
 package org.mozilla.gecko;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import android.text.TextUtils;
 import android.util.Log;
 

mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoSystemStateListener.java

@@ -15,7 +15,7 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.Log;
 import android.view.InputDevice;
 import org.mozilla.gecko.annotation.WrapForJNI;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java

@@ -14,7 +14,6 @@ import org.mozilla.gecko.util.GeckoBundle;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.geckoview.BuildConfig;
 import org.mozilla.geckoview.GeckoResult;
-import org.mozilla.gecko.GeckoJavaSampler;
 
 import android.app.ActivityManager;
 import android.content.Context;
@@ -28,9 +27,9 @@ import android.os.Message;
 import android.os.MessageQueue;
 import android.os.Process;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import android.text.TextUtils;
 import android.util.Log;
 

mobile/android/geckoview/src/main/java/org/mozilla/gecko/MultiMap.java

@@ -1,7 +1,7 @@
 package org.mozilla.gecko;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collections;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/PrefsHelper.java

@@ -8,7 +8,7 @@ package org.mozilla.gecko;
 import org.mozilla.gecko.annotation.RobocopTarget;
 import org.mozilla.gecko.annotation.WrapForJNI;
 
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
 
 import java.util.ArrayList;
 import java.util.HashSet;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoSurfaceTexture.java

@@ -7,7 +7,7 @@ package org.mozilla.gecko.gfx;
 
 import android.graphics.SurfaceTexture;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.Log;
 
 import java.util.concurrent.atomic.AtomicInteger;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/VsyncSource.java

@@ -10,7 +10,7 @@ import android.hardware.display.DisplayManager;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.view.Choreographer;
 import android.view.Display;
 import org.mozilla.gecko.annotation.WrapForJNI;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoPlayerFactory.java

@@ -4,7 +4,7 @@
 
 package org.mozilla.gecko.media;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import java.util.ArrayList;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/LollipopAsyncCodec.java

@@ -16,7 +16,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.Surface;
 
 import java.io.IOException;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/NativeZip.java

@@ -5,7 +5,7 @@
 
 package org.mozilla.gecko.mozglue;
 
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
 import org.mozilla.gecko.annotation.JNITarget;
 
 import java.io.InputStream;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/SafeIntent.java

@@ -10,7 +10,7 @@ package org.mozilla.gecko.mozglue;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import java.util.ArrayList;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java

@@ -23,10 +23,10 @@ import android.os.DeadObjectException;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
-import android.support.annotation.NonNull;
-import android.support.v4.util.ArrayMap;
-import android.support.v4.util.ArraySet;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.annotation.NonNull;
+import androidx.collection.ArrayMap;
+import androidx.collection.ArraySet;
+import androidx.collection.SimpleArrayMap;
 import android.util.Log;
 
 

mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/ServiceAllocator.java

@@ -16,7 +16,7 @@ import android.content.pm.ServiceInfo;
 import android.content.ServiceConnection;
 import android.os.Build;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import java.util.BitSet;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/ServiceUtils.java

@@ -9,7 +9,7 @@ import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /* package */ final class ServiceUtils {
     private static final String DEFAULT_ISOLATED_CONTENT_SERVICE_NAME_SUFFIX = "0";

mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java

@@ -19,8 +19,8 @@ import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.support.annotation.ColorInt;
-import android.support.v7.graphics.Palette;
+import androidx.annotation.ColorInt;
+import androidx.palette.graphics.Palette;
 import android.util.Base64;
 import android.util.Log;
 

mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ContentUriUtils.java

@@ -24,7 +24,7 @@ import android.os.Build;
 import android.os.Environment;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import java.io.File;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/DateUtil.java

@@ -6,7 +6,7 @@
 
 package org.mozilla.gecko.util;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/DebugConfig.java

@@ -6,7 +6,7 @@
 package org.mozilla.gecko.util;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import org.mozilla.gecko.GeckoThread;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/FileUtils.java

@@ -13,7 +13,7 @@ import android.os.Build;
 import android.os.Environment;
 import android.os.storage.StorageVolume;
 import android.provider.MediaStore;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 

mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/GeckoBundle.java

@@ -16,7 +16,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
 
 import java.lang.reflect.Array;
 import java.util.Arrays;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ImageDecoder.java

@@ -1,8 +1,8 @@
 package org.mozilla.gecko.util;
 
 import android.graphics.Bitmap;
-import android.support.annotation.AnyThread;
-import android.support.annotation.NonNull;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
 
 import org.mozilla.gecko.GeckoThread;
 import org.mozilla.gecko.annotation.WrapForJNI;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ImageResource.java

@@ -7,9 +7,9 @@
 package org.mozilla.gecko.util;
 
 import android.graphics.Bitmap;
-import android.support.annotation.AnyThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import java.util.ArrayList;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/IntentUtils.java

@@ -10,8 +10,8 @@ import android.annotation.TargetApi;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.CheckResult;
-import android.support.annotation.NonNull;
+import androidx.annotation.CheckResult;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.mozilla.gecko.mozglue.SafeIntent;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/NetworkUtils.java

@@ -8,7 +8,7 @@ package org.mozilla.gecko.util;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.telephony.TelephonyManager;
 
 public class NetworkUtils {

mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java

@@ -18,7 +18,7 @@
 
 package org.mozilla.gecko.util;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import java.io.IOException;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/StringUtils.java

@@ -8,7 +8,7 @@ package org.mozilla.gecko.util;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import java.nio.charset.Charset;

mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/XPCOMEventTarget.java

@@ -10,7 +10,7 @@ import org.mozilla.gecko.GeckoThread;
 import org.mozilla.gecko.mozglue.JNIObject;
 import org.mozilla.geckoview.BuildConfig;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Wrapper for nsIEventTarget, enabling seamless dispatch of java runnables to

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/AllowOrDeny.java

@@ -6,7 +6,7 @@
 
 package org.mozilla.geckoview;
 
-import android.support.annotation.AnyThread;
+import androidx.annotation.AnyThread;
 
 /**
  * This represents a decision to allow or deny a request.

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Autocomplete.java

@@ -9,11 +9,11 @@ package org.mozilla.geckoview;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import android.support.annotation.AnyThread;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
+import androidx.annotation.AnyThread;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import android.util.Log;
 
 import org.mozilla.gecko.EventDispatcher;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Autofill.java

@@ -15,12 +15,12 @@ import java.util.Map;
 import android.annotation.TargetApi;
 import android.graphics.Rect;
 import android.os.Build;
-import android.support.annotation.AnyThread;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
-import android.support.v4.util.ArrayMap;
+import androidx.annotation.AnyThread;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import androidx.collection.ArrayMap;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.View;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/BasicSelectionActionDelegate.java

@@ -15,9 +15,9 @@ import android.graphics.Matrix;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import android.util.Log;
 import android.view.ActionMode;
 import android.view.Menu;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CompositorController.java

@@ -9,9 +9,9 @@ import org.mozilla.gecko.annotation.RobocopTarget;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import android.graphics.Color;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 
 import java.util.ArrayList;
 import java.util.List;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java

@@ -11,11 +11,11 @@ import java.lang.annotation.RetentionPolicy;
 
 import android.os.Parcelable;
 import android.os.Parcel;
-import android.support.annotation.AnyThread;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
+import androidx.annotation.AnyThread;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import android.text.TextUtils;
 
 import org.mozilla.gecko.util.GeckoBundle;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlockingController.java

@@ -12,11 +12,11 @@ import org.json.JSONObject;
 import org.mozilla.gecko.EventDispatcher;
 import org.mozilla.gecko.util.GeckoBundle;
 
-import android.support.annotation.AnyThread;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
-import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
+import androidx.annotation.AnyThread;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
 import android.util.Log;
 
 import java.lang.annotation.Retention;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CrashReporter.java

@@ -6,8 +6,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.AnyThread;
-import android.support.annotation.NonNull;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
 import android.util.Log;
 import org.json.JSONException;
 import org.json.JSONObject;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoDisplay.java

@@ -8,10 +8,10 @@ package org.mozilla.geckoview;
 
 import android.graphics.Bitmap;
 import android.graphics.Rect;
-import android.support.annotation.AnyThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import android.view.Surface;
 
 import org.mozilla.gecko.util.ThreadUtils;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoEditable.java

@@ -29,8 +29,8 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.os.RemoteException;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.InputType;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoFontScaleListener.java

@@ -6,7 +6,6 @@
 package org.mozilla.geckoview;
 
 import org.mozilla.gecko.util.ThreadUtils;
-import org.mozilla.geckoview.GeckoRuntimeSettings;
 
 import android.annotation.SuppressLint;
 import android.content.ContentResolver;
@@ -14,7 +13,7 @@ import android.content.Context;
 import android.database.ContentObserver;
 import android.net.Uri;
 import android.provider.Settings;
-import android.support.annotation.UiThread;
+import androidx.annotation.UiThread;
 import android.util.Log;
 
 /**

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoInputConnection.java

@@ -14,7 +14,7 @@ import android.media.AudioManager;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.Editable;
 import android.text.Selection;
 import android.text.SpannableString;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoInputStream.java

@@ -4,8 +4,8 @@ import org.mozilla.gecko.annotation.WrapForJNI;
 import org.mozilla.gecko.mozglue.JNIObject;
 import org.mozilla.gecko.util.ThreadUtils;
 
-import android.support.annotation.AnyThread;
-import android.support.annotation.NonNull;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
 
 import java.io.IOException;
 import java.io.InputStream;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoResult.java

@@ -9,10 +9,10 @@ import org.mozilla.gecko.util.XPCOMEventTarget;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.AnyThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.collection.SimpleArrayMap;
 
 import java.util.ArrayList;
 import java.util.Arrays;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java

@@ -6,10 +6,10 @@
 
 package org.mozilla.geckoview;
 
-import android.arch.lifecycle.ProcessLifecycleOwner;
-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleObserver;
-import android.arch.lifecycle.OnLifecycleEvent;
+import androidx.lifecycle.ProcessLifecycleOwner;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
 
 import android.app.ActivityManager;
 import android.content.ComponentName;
@@ -24,11 +24,11 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.Process;
 import android.provider.Settings;
-import android.support.annotation.AnyThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
-import android.support.v4.util.ArrayMap;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import androidx.collection.ArrayMap;
 import android.util.Log;
 
 import org.mozilla.gecko.EventDispatcher;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java

@@ -18,10 +18,10 @@ import android.os.Bundle;
 import android.os.LocaleList;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.AnyThread;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.AnyThread;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java

@@ -53,13 +53,13 @@ import android.os.IInterface;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
-import android.support.annotation.AnyThread;
-import android.support.annotation.IntDef;
-import android.support.annotation.LongDef;
-import android.support.annotation.Nullable;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringDef;
-import android.support.annotation.UiThread;
+import androidx.annotation.AnyThread;
+import androidx.annotation.IntDef;
+import androidx.annotation.LongDef;
+import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringDef;
+import androidx.annotation.UiThread;
 import android.text.TextUtils;
 import android.util.Base64;
 import android.util.Log;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSessionHandler.java

@@ -10,7 +10,7 @@ import org.mozilla.gecko.util.BundleEventListener;
 import org.mozilla.gecko.util.EventCallback;
 import org.mozilla.gecko.util.GeckoBundle;
 
-import android.support.annotation.UiThread;
+import androidx.annotation.UiThread;
 import android.util.Log;
 
 /* package */ abstract class GeckoSessionHandler<Delegate>

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSessionSettings.java

@@ -10,9 +10,9 @@ import org.mozilla.gecko.util.GeckoBundle;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.AnyThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Collection;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoVRManager.java

@@ -6,7 +6,7 @@
 
 package org.mozilla.geckoview;
 
-import android.support.annotation.AnyThread;
+import androidx.annotation.AnyThread;
 
 import org.mozilla.gecko.annotation.WrapForJNI;
 

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java

@@ -27,12 +27,12 @@ import android.graphics.RectF;
 import android.graphics.Region;
 import android.os.Build;
 import android.os.Handler;
-import android.support.annotation.AnyThread;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.AnyThread;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.util.SparseArray;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoWebExecutor.java

@@ -6,9 +6,9 @@
 
 package org.mozilla.geckoview;
 
-import android.support.annotation.AnyThread;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
+import androidx.annotation.AnyThread;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Image.java

@@ -7,8 +7,8 @@
 package org.mozilla.geckoview;
 
 import android.graphics.Bitmap;
-import android.support.annotation.AnyThread;
-import android.support.annotation.NonNull;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
 
 import org.mozilla.gecko.util.GeckoBundle;
 import org.mozilla.gecko.util.ImageResource;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaElement.java

@@ -6,11 +6,11 @@
 
 package org.mozilla.geckoview;
 
-import android.support.annotation.AnyThread;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
+import androidx.annotation.AnyThread;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 
 import org.mozilla.gecko.util.GeckoBundle;
 

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaSession.java

@@ -9,11 +9,11 @@ package org.mozilla.geckoview;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import android.support.annotation.AnyThread;
-import android.support.annotation.LongDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
+import androidx.annotation.AnyThread;
+import androidx.annotation.LongDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import android.util.Log;
 
 import org.mozilla.gecko.util.EventCallback;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/OverscrollEdgeEffect.java

@@ -14,9 +14,9 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import android.widget.EdgeEffect;
 
 import java.lang.reflect.Field;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/PanZoomController.java

@@ -17,9 +17,9 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
-import android.support.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
+import androidx.annotation.IntDef;
 import android.util.Log;
 import android.util.Pair;
 import android.view.MotionEvent;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ProfilerController.java

@@ -8,9 +8,9 @@ package org.mozilla.geckoview;
 
 import org.mozilla.gecko.GeckoJavaSampler;
 
-import android.support.annotation.Nullable;
-import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
+import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
 
 /**
  * ProfilerController is used to manage GeckoProfiler related features.

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/RuntimeSettings.java

@@ -12,10 +12,10 @@ import java.util.Map;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.util.ArrayMap;
-import android.support.annotation.AnyThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.collection.ArrayMap;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.mozilla.gecko.EventDispatcher;
 import org.mozilla.gecko.util.GeckoBundle;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/RuntimeTelemetry.java

@@ -6,8 +6,8 @@
 
 package org.mozilla.geckoview;
 
-import android.support.annotation.AnyThread;
-import android.support.annotation.NonNull;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
 
 import org.mozilla.gecko.annotation.WrapForJNI;
 import org.mozilla.gecko.mozglue.JNIObject;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ScreenLength.java

@@ -3,9 +3,9 @@
 
 package org.mozilla.geckoview;
 
-import android.support.annotation.AnyThread;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
+import androidx.annotation.AnyThread;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SessionAccessibility.java

@@ -19,9 +19,9 @@ import android.graphics.Matrix;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SessionFinder.java

@@ -11,9 +11,9 @@ import org.mozilla.geckoview.GeckoSession.FinderFindFlags;
 import org.mozilla.geckoview.GeckoSession.FinderDisplayFlags;
 import org.mozilla.geckoview.GeckoSession.FinderResult;
 
-import android.support.annotation.AnyThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 
 import java.util.Arrays;