Migrate embedding to AndroidX (#17075)

DEPS

@@ -497,11 +497,11 @@ deps = {
      'dep_type': 'cipd',
    },
 
-  'src/third_party/robolectric': {
+  'src/third_party/android_embedding_dependencies': {
      'packages': [
        {
-        'package': 'flutter/android/robolectric_bundle',
-        'version': 'last_updated:2019-09-09T16:47:38-0700'
+        'package': 'flutter/android/embedding_bundle',
+        'version': 'last_updated:2020-03-13T15:42:26-0700'
        }
      ],
      'condition': 'download_android_deps',
@@ -593,15 +593,6 @@ hooks = [
     'pattern': '.',
     'action': ['python', 'src/build/vs_toolchain.py', 'update'],
   },
-  {
-    'name': 'download_android_support',
-    'pattern': '.',
-    'condition': 'download_android_deps',
-    'action': [
-        'python',
-        'src/flutter/tools/android_support/download_android_support.py',
-    ],
-  },
   {
     'name': 'generate_package_files',
     'pattern': '.',

ci/licenses_golden/tool_signature

-Signature: 9ad4afaa43bd81d0e6a011688ca40377
+Signature: c182c713338fa4bfd82bfab82778038b
 

shell/platform/android/BUILD.gn

@@ -228,15 +228,14 @@ android_java_sources = [
   "io/flutter/view/VsyncWaiter.java",
 ]
 
-android_support_jars = [
-  "//third_party/android_support/android_support_compat.jar",
-  "//third_party/android_support/android_support_annotations.jar",
-  "//third_party/android_support/android_support_fragment.jar",
-  "//third_party/android_support/android_arch_lifecycle_common.jar",
-  "//third_party/android_support/android_arch_lifecycle_common_java8.jar",
-  "//third_party/android_support/android_arch_lifecycle_runtime.jar",
-  "//third_party/android_support/android_arch_lifecycle_viewmodel.jar",
-]
+list_script = rebase_path("//build/ls.py", ".", "//")
+embedding_dependencies_jars =
+    exec_script(list_script,
+                [
+                  "--target-directory",
+                  rebase_path("//third_party/android_embedding_dependencies"),
+                ],
+                "list lines")
 
 action("flutter_shell_java") {
   script = "//build/android/gyp/javac.py"
@@ -256,10 +255,7 @@ action("flutter_shell_java") {
     source_jar_path,
     source_jar_path + ".md5.stamp",
   ]
-  inputs = [
-    android_sdk_jar,
-  ]
-  inputs += android_support_jars
+  inputs = [ android_sdk_jar ] + embedding_dependencies_jars
 
   _rebased_current_path = rebase_path(".")
   _rebased_jar_path = rebase_path(jar_path, root_build_dir)
@@ -267,7 +263,7 @@ action("flutter_shell_java") {
   _rebased_depfile = rebase_path(depfile, root_build_dir)
   _rebased_android_sdk_jar = rebase_path(android_sdk_jar, root_build_dir)
   _rebased_classpath = [ _rebased_android_sdk_jar ] +
-                       rebase_path(android_support_jars, root_build_dir)
+                       rebase_path(embedding_dependencies_jars, root_build_dir)
 
   args = [
     "--depfile=$_rebased_depfile",
@@ -357,10 +353,10 @@ action("android_jar") {
 }
 
 action("pom_libflutter") {
-  script = "//flutter/tools/android_support/generate_pom_file.py"
+  script = "//flutter/tools/androidx/generate_pom_file.py"
 
   inputs = [
-    "//flutter/tools/android_support/files.json",
+    "//flutter/tools/androidx/files.json",
   ]
 
   artifact_id =
@@ -381,10 +377,10 @@ action("pom_libflutter") {
 }
 
 action("pom_embedding") {
-  script = "//flutter/tools/android_support/generate_pom_file.py"
+  script = "//flutter/tools/androidx/generate_pom_file.py"
 
   inputs = [
-    "//flutter/tools/android_support/files.json",
+    "//flutter/tools/androidx/files.json",
   ]
 
   artifact_id = "flutter_embedding_$flutter_runtime_mode"
@@ -451,21 +447,9 @@ action("robolectric_tests") {
   ]
 
   _jar_dependencies = [
-    android_sdk_jar,
-    embedding_jar_path,
-    "//third_party/robolectric/lib/junit-3.8.jar",
-    "//third_party/robolectric/lib/junit-4.13-beta-3.jar",
-    "//third_party/robolectric/lib/robolectric-3.8.jar",
-    "//third_party/robolectric/lib/shadows-framework-3.8.jar",
-    "//third_party/robolectric/lib/annotations-3.8.jar",
-    "//third_party/robolectric/lib/shadowapi-3.8.jar",
-    "//third_party/robolectric/lib/runtime-1.1.1.jar",
-    "//third_party/robolectric/lib/common-1.1.1.jar",
-    "//third_party/robolectric/lib/common-java8-1.1.1.jar",
-    "//third_party/robolectric/lib/support-annotations-28.0.0.jar",
-    "//third_party/robolectric/lib/support-fragment-25.2.0.jar",
-    "//third_party/robolectric/lib/mockito-all-1.10.19.jar",
-  ]
+                        android_sdk_jar,
+                        embedding_jar_path,
+                      ] + embedding_dependencies_jars
 
   inputs = _jar_dependencies
 
@@ -532,7 +516,7 @@ zip_bundle("android") {
 # https://github.com/flutter/flutter/issues/42400
 action("gen_android_javadoc") {
   script = "//flutter/tools/gen_javadoc.py"
-  sources = android_java_sources + android_support_jars
+  sources = android_java_sources + embedding_dependencies_jars
 
   outputs = [
     "$target_gen_dir/javadocs",

shell/platform/android/embedding_bundle/.gitignore

+# Don't include the jars in the engine repo.
+lib/
+.gradle

shell/platform/android/embedding_bundle/build.gradle

@@ -44,27 +44,23 @@ android {
     embedding "androidx.fragment:fragment:1.1.0"
 
     def lifecycle_version = "2.2.0"
-    embedding "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-    embedding "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
     embedding "androidx.lifecycle:lifecycle-runtime:$lifecycle_version"
-    embedding "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"
-    embedding "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
+    embedding "androidx.lifecycle:lifecycle-common:$lifecycle_version"
     embedding "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-    embedding "androidx.lifecycle:lifecycle-service:$lifecycle_version"
-    embedding "androidx.lifecycle:lifecycle-process:$lifecycle_version"
-    embedding "androidx.lifecycle:lifecycle-reactivestreams:$lifecycle_version"
 
     // Testing
-    embeddingTesting "androidx.arch.core:core-testing:2.1.0"
     embeddingTesting "org.robolectric:android-all:8.1.0-robolectric-4611349"
     // This is required by the robolectric test.
     embeddingTesting_duplicated "org.robolectric:android-all:4.1.2_r1-robolectric-r1"
-    embeddingTesting "org.robolectric:robolectric:3.8"
-    embeddingTesting "org.robolectric:junit:3.8"
-    embeddingTesting "org.robolectric:shadows-framework:3.8"
-    embeddingTesting "org.robolectric:resources:3.8"
     embeddingTesting "org.mockito:mockito-all:1.10.19"
-    embeddingTesting "junit:junit:4.13-beta-3"
+    embeddingTesting ("org.robolectric:robolectric:4.3") {
+      // org.hamcrest is added by org.mockito:mockito-all
+      exclude group: "org.hamcrest", module:"hamcrest-core"
+    }
+    embeddingTesting ("junit:junit:4.13") {
+      // org.hamcrest is added by org.mockito:mockito-all
+      exclude group: "org.hamcrest", module:"hamcrest-core"
+    }
   }
 }
 

shell/platform/android/io/flutter/Log.java

@@ -4,7 +4,7 @@
 
 package io.flutter;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Port of {@link android.util.Log} that only logs in {@link io.flutter.BuildConfig#DEBUG} mode and

shell/platform/android/io/flutter/app/FlutterActivity.java

@@ -9,7 +9,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import io.flutter.app.FlutterActivityDelegate.ViewFactory;
 import io.flutter.plugin.common.PluginRegistry;
 import io.flutter.view.FlutterNativeView;

shell/platform/android/io/flutter/app/FlutterApplication.java

@@ -6,7 +6,7 @@ package io.flutter.app;
 
 import android.app.Activity;
 import android.app.Application;
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
 import io.flutter.view.FlutterMain;
 
 /**

shell/platform/android/io/flutter/app/FlutterFragmentActivity.java

@@ -8,7 +8,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 import io.flutter.app.FlutterActivityDelegate.ViewFactory;
 import io.flutter.plugin.common.PluginRegistry;
 import io.flutter.view.FlutterNativeView;
@@ -25,7 +25,7 @@ import io.flutter.view.FlutterView;
  * app to ensure that {@link FragmentActivity} is available at runtime.
  *
  * @see <a target="_new"
- *     href="https://developer.android.com/topic/libraries/support-library/setup.html">https://developer.android.com/topic/libraries/support-library/setup.html</a>
+ *     href="https://developer.android.com/training/testing/set-up-project">https://developer.android.com/training/testing/set-up-project</a>
  */
 public class FlutterFragmentActivity extends FragmentActivity
     implements FlutterView.Provider, PluginRegistry, ViewFactory {

shell/platform/android/io/flutter/embedding/android/AndroidKeyProcessor.java

@@ -4,10 +4,10 @@
 
 package io.flutter.embedding.android;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.embedding.engine.systemchannels.KeyEventChannel;
 import io.flutter.plugin.editing.TextInputPlugin;
 

shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java

 package io.flutter.embedding.android;
 
 import android.os.Build;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
 import android.view.InputDevice;
 import android.view.MotionEvent;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
 import io.flutter.embedding.engine.renderer.FlutterRenderer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

shell/platform/android/io/flutter/embedding/android/DrawableSplashScreen.java

@@ -8,11 +8,11 @@ import android.animation.Animator;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * {@link SplashScreen} that displays a given {@link Drawable}, which then fades its alpha to zero

shell/platform/android/io/flutter/embedding/android/FlutterActivity.java

@@ -17,9 +17,6 @@ import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.NORMAL_T
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.SPLASH_SCREEN_META_DATA_KEY;
 
 import android.app.Activity;
-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.LifecycleRegistry;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -30,12 +27,15 @@ import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
 import io.flutter.Log;
 import io.flutter.embedding.android.FlutterActivityLaunchConfigs.BackgroundMode;
 import io.flutter.embedding.engine.FlutterEngine;

shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java

@@ -7,17 +7,17 @@ package io.flutter.embedding.android;
 import static android.content.ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW;
 
 import android.app.Activity;
-import android.arch.lifecycle.Lifecycle;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.Lifecycle;
 import io.flutter.Log;
 import io.flutter.app.FlutterActivity;
 import io.flutter.embedding.engine.FlutterEngine;

shell/platform/android/io/flutter/embedding/android/FlutterEngineConfigurator.java

@@ -5,14 +5,14 @@
 package io.flutter.embedding.android;
 
 import android.app.Activity;
-import android.arch.lifecycle.Lifecycle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
 import io.flutter.embedding.engine.FlutterEngine;
 
 /**
  * Configures a {@link FlutterEngine} after it is created, e.g., adds plugins.
  *
- * <p>This interface may be applied to a {@link android.support.v4.app.FragmentActivity} that owns a
+ * <p>This interface may be applied to a {@link androidx.fragment.app.FragmentActivity} that owns a
  * {@code FlutterFragment}.
  */
 public interface FlutterEngineConfigurator {

shell/platform/android/io/flutter/embedding/android/FlutterEngineProvider.java

@@ -5,8 +5,8 @@
 package io.flutter.embedding.android;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.embedding.engine.FlutterEngine;
 
 /**

shell/platform/android/io/flutter/embedding/android/FlutterFragment.java

@@ -5,18 +5,18 @@
 package io.flutter.embedding.android;
 
 import android.app.Activity;
-import android.arch.lifecycle.Lifecycle;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.Lifecycle;
 import io.flutter.Log;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterShellArgs;

shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java

@@ -26,15 +26,15 @@ import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 import io.flutter.Log;
 import io.flutter.embedding.android.FlutterActivityLaunchConfigs.BackgroundMode;
 import io.flutter.embedding.engine.FlutterEngine;

shell/platform/android/io/flutter/embedding/android/FlutterSplashView.java

@@ -8,12 +8,12 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.Log;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.renderer.FlutterUiDisplayListener;

shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java

@@ -6,11 +6,11 @@ package io.flutter.embedding.android;
 
 import android.content.Context;
 import android.graphics.PixelFormat;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.Log;
 import io.flutter.embedding.engine.renderer.FlutterRenderer;
 import io.flutter.embedding.engine.renderer.FlutterUiDisplayListener;

shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java

@@ -6,11 +6,11 @@ package io.flutter.embedding.android;
 
 import android.content.Context;
 import android.graphics.SurfaceTexture;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.Surface;
 import android.view.TextureView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.Log;
 import io.flutter.embedding.engine.renderer.FlutterRenderer;
 import io.flutter.embedding.engine.renderer.RenderSurface;

shell/platform/android/io/flutter/embedding/android/FlutterView.java

@@ -12,10 +12,6 @@ import android.graphics.Insets;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.LocaleList;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.VisibleForTesting;
 import android.text.format.DateFormat;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
@@ -27,6 +23,10 @@ import android.view.accessibility.AccessibilityNodeProvider;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.widget.FrameLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.VisibleForTesting;
 import io.flutter.Log;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.renderer.FlutterRenderer;

shell/platform/android/io/flutter/embedding/android/SplashScreen.java

@@ -7,9 +7,9 @@ package io.flutter.embedding.android;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * Splash screen configuration for a given Flutter experience.

shell/platform/android/io/flutter/embedding/android/SplashScreenProvider.java

@@ -4,7 +4,7 @@
 
 package io.flutter.embedding.android;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Provides a {@link SplashScreen} to display while Flutter initializes and renders its first frame.

shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java

@@ -5,8 +5,8 @@
 package io.flutter.embedding.engine;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.Log;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.embedding.engine.loader.FlutterLoader;

shell/platform/android/io/flutter/embedding/engine/FlutterEngineCache.java

@@ -4,9 +4,9 @@
 
 package io.flutter.embedding.engine;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import java.util.HashMap;
 import java.util.Map;
 

shell/platform/android/io/flutter/embedding/engine/FlutterEnginePluginRegistry.java

@@ -6,14 +6,14 @@ package io.flutter.embedding.engine;
 
 import android.app.Activity;
 import android.app.Service;
-import android.arch.lifecycle.Lifecycle;
 import android.content.BroadcastReceiver;
 import android.content.ContentProvider;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Lifecycle;
 import io.flutter.Log;
 import io.flutter.embedding.engine.loader.FlutterLoader;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;

shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java

@@ -9,13 +9,13 @@ import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.SurfaceTexture;
 import android.os.Looper;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
-import android.support.annotation.VisibleForTesting;
 import android.view.Surface;
 import android.view.SurfaceHolder;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import androidx.annotation.VisibleForTesting;
 import io.flutter.Log;
 import io.flutter.embedding.engine.FlutterEngine.EngineLifecycleListener;
 import io.flutter.embedding.engine.dart.PlatformMessageHandler;

shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java

@@ -6,7 +6,7 @@ package io.flutter.embedding.engine;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.util.*;
 
 /**

shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java

@@ -5,9 +5,9 @@
 package io.flutter.embedding.engine.dart;
 
 import android.content.res.AssetManager;
-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 io.flutter.Log;
 import io.flutter.embedding.engine.FlutterJNI;
 import io.flutter.plugin.common.BinaryMessenger;

shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java

@@ -4,9 +4,9 @@
 
 package io.flutter.embedding.engine.dart;
 
-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 io.flutter.Log;
 import io.flutter.embedding.engine.FlutterJNI;
 import io.flutter.plugin.common.BinaryMessenger;

shell/platform/android/io/flutter/embedding/engine/dart/PlatformMessageHandler.java

@@ -4,8 +4,8 @@
 
 package io.flutter.embedding.engine.dart;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /** Handler that receives messages from Dart code. */
 public interface PlatformMessageHandler {

shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java

@@ -12,10 +12,10 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.WindowManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.BuildConfig;
 import io.flutter.embedding.engine.FlutterJNI;
 import io.flutter.util.PathUtils;

shell/platform/android/io/flutter/embedding/engine/loader/ResourceExtractor.java

@@ -11,9 +11,9 @@ import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
 import android.os.AsyncTask;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
 import io.flutter.BuildConfig;
 import java.io.*;
 import java.util.ArrayList;

shell/platform/android/io/flutter/embedding/engine/plugins/FlutterPlugin.java

@@ -4,9 +4,9 @@
 
 package io.flutter.embedding.engine.plugins;
 
-import android.arch.lifecycle.Lifecycle;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.platform.PlatformViewRegistry;

shell/platform/android/io/flutter/embedding/engine/plugins/PluginRegistry.java

@@ -4,8 +4,8 @@
 
 package io.flutter.embedding.engine.plugins;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import java.util.Set;
 
 public interface PluginRegistry {

shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityAware.java

@@ -4,7 +4,7 @@
 
 package io.flutter.embedding.engine.plugins.activity;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * {@link FlutterPlugin} that is interested in {@link Activity} lifecycle events related to a {@link

shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityControlSurface.java

@@ -5,11 +5,11 @@
 package io.flutter.embedding.engine.plugins.activity;
 
 import android.app.Activity;
-import android.arch.lifecycle.Lifecycle;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Lifecycle;
 
 /**
  * Control surface through which an {@link Activity} attaches to a {@link FlutterEngine}.

shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.java

@@ -6,8 +6,8 @@ package io.flutter.embedding.engine.plugins.activity;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.plugin.common.PluginRegistry;
 
 /**

shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverAware.java

@@ -4,7 +4,7 @@
 
 package io.flutter.embedding.engine.plugins.broadcastreceiver;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * A {@link FlutterPlugin} that wants to know when it is running within a {@link BroadcastReceiver}.

shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverControlSurface.java

@@ -4,9 +4,9 @@
 
 package io.flutter.embedding.engine.plugins.broadcastreceiver;
 
-import android.arch.lifecycle.Lifecycle;
 import android.content.BroadcastReceiver;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
 
 /**
  * Control surface through which a {@link BroadcastReceiver} attaches to a {@link FlutterEngine}.

shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverPluginBinding.java

@@ -5,7 +5,7 @@
 package io.flutter.embedding.engine.plugins.broadcastreceiver;
 
 import android.content.BroadcastReceiver;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Binding that gives {@link BroadcastReceiverAware} plugins access to an associated {@link

shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderAware.java

@@ -4,7 +4,7 @@
 
 package io.flutter.embedding.engine.plugins.contentprovider;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * A {@link FlutterPlugin} that wants to know when it is running within a {@link ContentProvider}.

shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderControlSurface.java

@@ -4,9 +4,9 @@
 
 package io.flutter.embedding.engine.plugins.contentprovider;
 
-import android.arch.lifecycle.Lifecycle;
 import android.content.ContentProvider;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
 
 /**
  * Control surface through which a {@link ContentProvider} attaches to a {@link FlutterEngine}.

shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderPluginBinding.java

@@ -5,7 +5,7 @@
 package io.flutter.embedding.engine.plugins.contentprovider;
 
 import android.content.ContentProvider;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Binding that gives {@link ContentProviderAware} plugins access to an associated {@link

shell/platform/android/io/flutter/embedding/engine/plugins/lifecycle/HiddenLifecycleReference.java

@@ -4,9 +4,9 @@
 
 package io.flutter.embedding.engine.plugins.lifecycle;
 
-import android.arch.lifecycle.Lifecycle;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
 
 /**
  * An {@code Object} that can be used to obtain a {@link Lifecycle} reference.

shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceAware.java

@@ -4,7 +4,7 @@
 
 package io.flutter.embedding.engine.plugins.service;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /** A {@link FlutterPlugin} that wants to know when it is running within a {@link Service}. */
 public interface ServiceAware {

shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceControlSurface.java

@@ -5,9 +5,9 @@
 package io.flutter.embedding.engine.plugins.service;
 
 import android.app.Service;
-import android.arch.lifecycle.Lifecycle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Lifecycle;
 
 /**
  * Control surface through which a {@link Service} attaches to a {@link FlutterEngine}.

shell/platform/android/io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java

@@ -5,8 +5,8 @@
 package io.flutter.embedding.engine.plugins.service;
 
 import android.app.Service;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /** Binding that gives {@link ServiceAware} plugins access to an associated {@link Service}. */
 public interface ServicePluginBinding {

shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java

@@ -4,7 +4,7 @@
 
 package io.flutter.embedding.engine.plugins.shim;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import io.flutter.Log;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
@@ -21,14 +21,18 @@ import java.util.Set;
  * plugin API behind the scenes.
  *
  * <p>The following is an example usage of {@code ShimPluginRegistry} within a {@code
- * FlutterActivity}: {@code // Create the FlutterEngine that will back the Flutter UI. FlutterEngine
- * flutterEngine = new FlutterEngine(context);
+ * FlutterActivity}:
  *
- * <p>// Create a ShimPluginRegistry and wrap the FlutterEngine with the shim. ShimPluginRegistry
- * shimPluginRegistry = new ShimPluginRegistry(flutterEngine, platformViewsController);
+ * <pre>
+ * // Create the FlutterEngine that will back the Flutter UI.
+ * FlutterEngine flutterEngine = new FlutterEngine(context);
  *
- * <p>// Use the GeneratedPluginRegistrant to add every plugin that's in the pubspec.
- * GeneratedPluginRegistrant.registerWith(shimPluginRegistry); }
+ * // Create a ShimPluginRegistry and wrap the FlutterEngine with the shim.
+ * ShimPluginRegistry shimPluginRegistry = new ShimPluginRegistry(flutterEngine, platformViewsController);
+ *
+ * // Use the GeneratedPluginRegistrant to add every plugin that's in the pubspec.
+ * GeneratedPluginRegistrant.registerWith(shimPluginRegistry);
+ * </pre>
  */
 public class ShimPluginRegistry implements PluginRegistry {
   private static final String TAG = "ShimPluginRegistry";

shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java

@@ -6,7 +6,7 @@ package io.flutter.embedding.engine.plugins.shim;
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import io.flutter.Log;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;

shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java

@@ -9,9 +9,9 @@ import android.graphics.Bitmap;
 import android.graphics.SurfaceTexture;
 import android.os.Build;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.Surface;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.Log;
 import io.flutter.embedding.engine.FlutterJNI;
 import io.flutter.view.TextureRegistry;

shell/platform/android/io/flutter/embedding/engine/renderer/RenderSurface.java

@@ -4,9 +4,9 @@
 
 package io.flutter.embedding.engine.renderer;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.Surface;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * Owns a {@code Surface} that {@code FlutterRenderer} would like to paint.

shell/platform/android/io/flutter/embedding/engine/systemchannels/AccessibilityChannel.java

 package io.flutter.embedding.engine.systemchannels;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.Log;
 import io.flutter.embedding.engine.FlutterJNI;
 import io.flutter.embedding.engine.dart.DartExecutor;

shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyEventChannel.java

@@ -5,10 +5,10 @@
 package io.flutter.embedding.engine.systemchannels;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.InputDevice;
 import android.view.KeyEvent;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.plugin.common.BasicMessageChannel;
 import io.flutter.plugin.common.JSONMessageCodec;

shell/platform/android/io/flutter/embedding/engine/systemchannels/LifecycleChannel.java

@@ -4,7 +4,7 @@
 
 package io.flutter.embedding.engine.systemchannels;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import io.flutter.Log;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.plugin.common.BasicMessageChannel;

shell/platform/android/io/flutter/embedding/engine/systemchannels/LocalizationChannel.java

@@ -5,7 +5,7 @@
 package io.flutter.embedding.engine.systemchannels;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import io.flutter.Log;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.plugin.common.JSONMethodCodec;

shell/platform/android/io/flutter/embedding/engine/systemchannels/NavigationChannel.java

@@ -4,8 +4,8 @@
 
 package io.flutter.embedding.engine.systemchannels;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.Log;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.plugin.common.JSONMethodCodec;

shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java

@@ -6,9 +6,9 @@ package io.flutter.embedding.engine.systemchannels;
 
 import android.content.pm.ActivityInfo;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import io.flutter.Log;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.plugin.common.JSONMethodCodec;

shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformViewsChannel.java

@@ -4,8 +4,8 @@
 
 package io.flutter.embedding.engine.systemchannels;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.Log;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.plugin.common.MethodCall;

shell/platform/android/io/flutter/embedding/engine/systemchannels/SettingsChannel.java

 package io.flutter.embedding.engine.systemchannels;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import io.flutter.Log;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.plugin.common.BasicMessageChannel;

shell/platform/android/io/flutter/embedding/engine/systemchannels/SystemChannel.java

@@ -4,7 +4,7 @@
 
 package io.flutter.embedding.engine.systemchannels;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import io.flutter.Log;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.plugin.common.BasicMessageChannel;

shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java

 package io.flutter.embedding.engine.systemchannels;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.inputmethod.EditorInfo;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.Log;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.plugin.common.JSONMethodCodec;

shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java

@@ -4,10 +4,10 @@
 
 package io.flutter.plugin.common;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import io.flutter.BuildConfig;
 import io.flutter.plugin.common.BinaryMessenger.BinaryMessageHandler;
 import io.flutter.plugin.common.BinaryMessenger.BinaryReply;

shell/platform/android/io/flutter/plugin/common/BinaryMessenger.java

@@ -4,9 +4,9 @@
 
 package io.flutter.plugin.common;
 
-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.nio.ByteBuffer;
 
 /**

shell/platform/android/io/flutter/plugin/common/ErrorLogResult.java

@@ -4,8 +4,8 @@
 
 package io.flutter.plugin.common;
 
-import android.support.annotation.Nullable;
 import android.util.Log;
+import androidx.annotation.Nullable;
 import io.flutter.BuildConfig;
 
 /**

shell/platform/android/io/flutter/plugin/common/EventChannel.java

@@ -4,8 +4,8 @@
 
 package io.flutter.plugin.common;
 
-import android.support.annotation.UiThread;
 import android.util.Log;
+import androidx.annotation.UiThread;
 import io.flutter.BuildConfig;
 import io.flutter.plugin.common.BinaryMessenger.BinaryMessageHandler;
 import io.flutter.plugin.common.BinaryMessenger.BinaryReply;

shell/platform/android/io/flutter/plugin/common/MessageCodec.java

@@ -4,7 +4,7 @@
 
 package io.flutter.plugin.common;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.nio.ByteBuffer;
 
 /**

shell/platform/android/io/flutter/plugin/common/MethodCall.java

@@ -4,7 +4,7 @@
 
 package io.flutter.plugin.common;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import io.flutter.BuildConfig;
 import java.util.Map;
 import org.json.JSONObject;

shell/platform/android/io/flutter/plugin/common/MethodChannel.java

@@ -4,10 +4,10 @@
 
 package io.flutter.plugin.common;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import io.flutter.BuildConfig;
 import io.flutter.plugin.common.BinaryMessenger.BinaryMessageHandler;
 import io.flutter.plugin.common.BinaryMessenger.BinaryReply;

shell/platform/android/io/flutter/plugin/common/PluginRegistry.java

@@ -219,7 +219,7 @@ public interface PluginRegistry {
     /**
      * Adds a callback allowing the plugin to take part in handling incoming calls to {@code
      * Activity#onRequestPermissionsResult(int, String[], int[])} or {@code
-     * android.support.v4.app.ActivityCompat.OnRequestPermissionsResultCallback#onRequestPermissionsResult(int,
+     * androidx.core.app.ActivityCompat.OnRequestPermissionsResultCallback#onRequestPermissionsResult(int,
      * String[], int[])}.
      *
      * <p>This registrar is for Flutter's v1 embedding. To listen for permission results in the v2

shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java

@@ -8,9 +8,6 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.Selection;
@@ -20,6 +17,9 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.embedding.engine.systemchannels.TextInputChannel;
 import io.flutter.plugin.platform.PlatformViewsController;

shell/platform/android/io/flutter/plugin/platform/AccessibilityEventsDelegate.java

@@ -4,10 +4,10 @@
 
 package io.flutter.plugin.platform;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.view.AccessibilityBridge;
 
 /**

shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java

@@ -11,13 +11,13 @@ import android.content.ClipboardManager;
 import android.content.Context;
 import android.graphics.Rect;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
 import android.view.HapticFeedbackConstants;
 import android.view.SoundEffectConstants;
 import android.view.View;
 import android.view.Window;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import io.flutter.embedding.engine.systemchannels.PlatformChannel;
 import java.util.ArrayList;
 import java.util.List;

shell/platform/android/io/flutter/plugin/platform/PlatformView.java

@@ -5,8 +5,8 @@
 package io.flutter.plugin.platform;
 
 import android.annotation.SuppressLint;
-import android.support.annotation.NonNull;
 import android.view.View;
+import androidx.annotation.NonNull;
 
 /** A handle to an Android view to be embedded in the Flutter hierarchy. */
 public interface PlatformView {

shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java

@@ -10,13 +10,13 @@ import static android.view.MotionEvent.PointerProperties;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
-import android.support.annotation.VisibleForTesting;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
+import androidx.annotation.VisibleForTesting;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.embedding.engine.systemchannels.PlatformViewsChannel;
 import io.flutter.plugin.editing.TextInputPlugin;

shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java

@@ -16,9 +16,6 @@ import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.Display;
 import android.view.Gravity;
@@ -28,6 +25,9 @@ import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.FrameLayout;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java

@@ -11,10 +11,10 @@ import android.content.Context;
 import android.hardware.display.DisplayManager;
 import android.hardware.display.VirtualDisplay;
 import android.os.Build;
-import android.support.annotation.NonNull;
 import android.view.Surface;
 import android.view.View;
 import android.view.ViewTreeObserver;
+import androidx.annotation.NonNull;
 import io.flutter.view.TextureRegistry;
 
 @TargetApi(Build.VERSION_CODES.KITKAT_WATCH)

shell/platform/android/io/flutter/view/AccessibilityBridge.java

@@ -15,9 +15,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
@@ -26,6 +23,9 @@ import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityNodeProvider;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import io.flutter.BuildConfig;
 import io.flutter.embedding.engine.systemchannels.AccessibilityChannel;
 import io.flutter.plugin.platform.PlatformViewsAccessibilityDelegate;

shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java

@@ -9,9 +9,6 @@ import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.MotionEvent;
@@ -20,6 +17,9 @@ import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityNodeProvider;
 import android.view.accessibility.AccessibilityRecord;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

shell/platform/android/io/flutter/view/FlutterCallbackInformation.java

@@ -4,8 +4,8 @@
 
 package io.flutter.view;
 
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
 import io.flutter.embedding.engine.FlutterJNI;
 
 /**

shell/platform/android/io/flutter/view/FlutterMain.java

@@ -6,9 +6,9 @@ package io.flutter.view;
 
 import android.content.Context;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import io.flutter.embedding.engine.loader.FlutterLoader;
 
 /**

shell/platform/android/io/flutter/view/FlutterNativeView.java

@@ -6,9 +6,9 @@ package io.flutter.view;
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
 import io.flutter.app.FlutterPluginRegistry;
 import io.flutter.embedding.engine.FlutterEngine.EngineLifecycleListener;
 import io.flutter.embedding.engine.FlutterJNI;

shell/platform/android/io/flutter/view/FlutterView.java

@@ -18,9 +18,6 @@ import android.graphics.SurfaceTexture;
 import android.os.Build;
 import android.os.Handler;
 import android.os.LocaleList;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.UiThread;
 import android.text.format.DateFormat;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -36,6 +33,9 @@ import android.view.accessibility.AccessibilityNodeProvider;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.UiThread;
 import io.flutter.app.FlutterPluginRegistry;
 import io.flutter.embedding.android.AndroidKeyProcessor;
 import io.flutter.embedding.android.AndroidTouchProcessor;

shell/platform/android/io/flutter/view/VsyncWaiter.java

@@ -4,9 +4,9 @@
 
 package io.flutter.view;
 
-import android.support.annotation.NonNull;
 import android.view.Choreographer;
 import android.view.WindowManager;
+import androidx.annotation.NonNull;
 import io.flutter.embedding.engine.FlutterJNI;
 
 // TODO(mattcarroll): add javadoc.

shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java

@@ -13,10 +13,10 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.app.Activity;
-import android.arch.lifecycle.Lifecycle;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
 import io.flutter.embedding.android.FlutterActivityAndFragmentDelegate.Host;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterEngineCache;

shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java

@@ -11,8 +11,8 @@ import static org.mockito.Mockito.when;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.embedding.android.FlutterActivityLaunchConfigs.BackgroundMode;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterJNI;

shell/platform/android/test/io/flutter/embedding/android/FlutterAndroidComponentTest.java

@@ -11,11 +11,11 @@ import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.withSettings;
 
 import android.app.Activity;
-import android.arch.lifecycle.Lifecycle;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Lifecycle;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterEngineCache;
 import io.flutter.embedding.engine.FlutterJNI;

shell/platform/android/test/io/flutter/embedding/engine/FlutterEnginePluginRegistryTest.java

@@ -7,7 +7,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import io.flutter.embedding.engine.loader.FlutterLoader;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.platform.PlatformViewsController;

shell/platform/android/test/io/flutter/embedding/engine/PluginComponentTest.java

@@ -5,7 +5,7 @@ import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterJNI;
 import io.flutter.embedding.engine.loader.FlutterLoader;

shell/platform/android/test/io/flutter/plugin/editing/InputConnectionAdaptorTest.java

@@ -10,7 +10,7 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import android.content.Context;
+import android.content.ClipboardManager;
 import android.content.res.AssetManager;
 import android.text.Editable;
 import android.text.InputType;
@@ -28,7 +28,6 @@ import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowClipboardManager;
 
 @Config(manifest = Config.NONE, sdk = 27, shadows = ShadowClipboardManager.class)
@@ -71,8 +70,8 @@ public class InputConnectionAdaptorTest {
 
   @Test
   public void testPerformContextMenuAction_cut() {
-    ShadowClipboardManager clipboardManager =
-        Shadow.extract(RuntimeEnvironment.application.getSystemService(Context.CLIPBOARD_SERVICE));
+    ClipboardManager clipboardManager =
+        RuntimeEnvironment.application.getSystemService(ClipboardManager.class);
     int selStart = 6;
     int selEnd = 11;
     Editable editable = sampleEditable(selStart, selEnd);
@@ -89,8 +88,8 @@ public class InputConnectionAdaptorTest {
 
   @Test
   public void testPerformContextMenuAction_copy() {
-    ShadowClipboardManager clipboardManager =
-        Shadow.extract(RuntimeEnvironment.application.getSystemService(Context.CLIPBOARD_SERVICE));
+    ClipboardManager clipboardManager =
+        RuntimeEnvironment.application.getSystemService(ClipboardManager.class);
     int selStart = 6;
     int selEnd = 11;
     Editable editable = sampleEditable(selStart, selEnd);
@@ -109,8 +108,8 @@ public class InputConnectionAdaptorTest {
 
   @Test
   public void testPerformContextMenuAction_paste() {
-    ShadowClipboardManager clipboardManager =
-        Shadow.extract(RuntimeEnvironment.application.getSystemService(Context.CLIPBOARD_SERVICE));
+    ClipboardManager clipboardManager =
+        RuntimeEnvironment.application.getSystemService(ClipboardManager.class);
     String textToBePasted = "deadbeef";
     clipboardManager.setText(textToBePasted);
     Editable editable = sampleEditable(0, 0);

shell/platform/android/test/io/flutter/plugins/GeneratedPluginRegistrant.java

 package io.flutter.plugins;
 
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import io.flutter.embedding.engine.FlutterEngine;
 import java.util.ArrayList;
 import java.util.List;

testing/run_tests.py

@@ -290,10 +290,10 @@ def RunJavaTests(filter, android_variant='android_debug_unopt'):
   android_out_dir = os.path.join(out_dir, android_variant)
   EnsureJavaTestsAreBuilt(android_out_dir)
 
-  robolectric_dir = os.path.join(buildroot_dir, 'third_party', 'robolectric', 'lib')
+  embedding_deps_dir = os.path.join(buildroot_dir, 'third_party', 'android_embedding_dependencies', 'lib')
   classpath = map(str, [
     os.path.join(buildroot_dir, 'third_party', 'android_tools', 'sdk', 'platforms', 'android-29', 'android.jar'),
-    os.path.join(robolectric_dir, '*'), # Wildcard for all jars in the directory
+    os.path.join(embedding_deps_dir, '*'), # Wildcard for all jars in the directory
     os.path.join(android_out_dir, 'flutter.jar'),
     os.path.join(android_out_dir, 'robolectric_tests.jar')
   ])
@@ -302,7 +302,7 @@ def RunJavaTests(filter, android_variant='android_debug_unopt'):
   command = [
     'java',
     '-Drobolectric.offline=true',
-    '-Drobolectric.dependency.dir=' + robolectric_dir,
+    '-Drobolectric.dependency.dir=' + embedding_deps_dir,
     '-classpath', ':'.join(classpath),
     '-Drobolectric.logging=stdout',
     'org.junit.runner.JUnitCore',

testing/scenario_app/android/app/build.gradle

@@ -12,7 +12,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -24,12 +24,12 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'android.arch.lifecycle:common-java8:1.1.1'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test:rules:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }

testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenarios/EngineLaunchE2ETest.java

@@ -7,9 +7,9 @@ package dev.flutter.scenarios;
 import static org.junit.Assert.fail;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.internal.runner.junit4.statement.UiThreadStatement;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.internal.runner.junit4.statement.UiThreadStatement;
+import androidx.test.runner.AndroidJUnit4;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import java.util.concurrent.CompletableFuture;

testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenarios/ExampleInstrumentedTest.java

@@ -3,8 +3,8 @@ package dev.flutter.scenarios;
 import static org.junit.Assert.*;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/BlankActivity.java

 package dev.flutter.scenarios;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 public class BlankActivity extends AppCompatActivity {
   @Override

testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TextPlatformViewActivity.java

@@ -8,7 +8,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import io.flutter.Log;
 import io.flutter.embedding.android.FlutterActivity;
 import io.flutter.embedding.engine.FlutterEngine;

testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TextPlatformViewFactory.java

@@ -5,7 +5,7 @@
 package dev.flutter.scenarios;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import io.flutter.plugin.common.MessageCodec;
 import io.flutter.plugin.common.StringCodec;
 import io.flutter.plugin.platform.PlatformView;