diff options
92 files changed, 268 insertions, 173 deletions
diff --git a/Android.mk b/Android.mk index 2a3285748..ca53fa7ad 100644 --- a/Android.mk +++ b/Android.mk @@ -37,9 +37,8 @@ LOCAL_AAPT2_ONLY := true LOCAL_MODULE_TAGS := optional LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-v4 \ - android-support-v7-recyclerview \ - android-support-dynamic-animation + androidx.recyclerview_recyclerview \ + androidx.dynamicanimation_dynamicanimation LOCAL_SRC_FILES := \ $(call all-proto-files-under, protos) \ diff --git a/build.gradle b/build.gradle index 4ae6600ee..dcb5b81c3 100644 --- a/build.gradle +++ b/build.gradle @@ -4,12 +4,12 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0-alpha12' - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3' + classpath 'com.android.tools.build:gradle:3.2.0-beta05' + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.6' } } -final String SUPPORT_LIBS_VERSION = '28.0.0-SNAPSHOT' +final String SUPPORT_LIBS_VERSION = '1.0.0-alpha1' apply plugin: 'com.android.application' apply plugin: 'com.google.protobuf' @@ -57,6 +57,8 @@ android { dimension "default" applicationId 'com.android.launcher3' testApplicationId 'com.android.launcher3.tests' + + minSdkVersion 28 } } @@ -84,7 +86,7 @@ android { androidTest { res.srcDirs = ['tests/res'] - java.srcDirs = ['tests/src'] + java.srcDirs = ['tests/src', 'tests/tapl'] manifest.srcFile "tests/AndroidManifest-common.xml" } @@ -118,9 +120,8 @@ repositories { } dependencies { - implementation "com.android.support:support-v4:${SUPPORT_LIBS_VERSION}" - implementation "com.android.support:support-dynamic-animation:${SUPPORT_LIBS_VERSION}" - implementation "com.android.support:recyclerview-v7:${SUPPORT_LIBS_VERSION}" + implementation "androidx.dynamicanimation:dynamicanimation:${SUPPORT_LIBS_VERSION}" + implementation "androidx.recyclerview:recyclerview:${SUPPORT_LIBS_VERSION}" implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7' quickstepImplementation fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar') @@ -132,7 +133,7 @@ dependencies { androidTestImplementation 'com.android.support.test:runner:1.0.0' androidTestImplementation 'com.android.support.test:rules:1.0.0' androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2' - androidTestImplementation "com.android.support:support-annotations:${SUPPORT_LIBS_VERSION}" + androidTestImplementation "androidx.annotation:annotation:${SUPPORT_LIBS_VERSION}" } protobuf { diff --git a/proguard.flags b/proguard.flags index ddae07e0d..a312b9103 100644 --- a/proguard.flags +++ b/proguard.flags @@ -95,7 +95,7 @@ # next row when focus is on the last item of last row when using a RecyclerView # Keep optimized and shrunk proguard to prevent issues like this when using # support jar. --keep class android.support.v7.widget.RecyclerView { *; } +-keep class androidx.recyclerview.widget.RecyclerView { *; } # Preference fragments -keep class ** extends android.preference.PreferenceFragment { diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java index e34631042..78f6ffa88 100644 --- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java +++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java @@ -17,7 +17,8 @@ package com.android.launcher3; import static com.android.launcher3.Utilities.SINGLE_FRAME_MS; import static com.android.launcher3.Utilities.postAsyncCallback; -import static com.android.systemui.shared.recents.utilities.Utilities.postAtFrontOfQueueAsynchronously; +import static com.android.systemui.shared.recents.utilities.Utilities + .postAtFrontOfQueueAsynchronously; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -25,12 +26,13 @@ import android.animation.AnimatorSet; import android.annotation.TargetApi; import android.os.Build; import android.os.Handler; -import android.support.annotation.BinderThread; -import android.support.annotation.UiThread; import com.android.systemui.shared.system.RemoteAnimationRunnerCompat; import com.android.systemui.shared.system.RemoteAnimationTargetCompat; +import androidx.annotation.BinderThread; +import androidx.annotation.UiThread; + @TargetApi(Build.VERSION_CODES.P) public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCompat { diff --git a/quickstep/src/com/android/quickstep/ActivityControlHelper.java b/quickstep/src/com/android/quickstep/ActivityControlHelper.java index bb5bf6e1c..185080eef 100644 --- a/quickstep/src/com/android/quickstep/ActivityControlHelper.java +++ b/quickstep/src/com/android/quickstep/ActivityControlHelper.java @@ -42,8 +42,6 @@ import android.graphics.Rect; import android.os.Build; import android.os.Handler; import android.os.Looper; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; import android.view.View; import com.android.launcher3.BaseDraggingActivity; @@ -77,6 +75,9 @@ import java.util.Objects; import java.util.function.BiPredicate; import java.util.function.Consumer; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; + /** * Utility class which abstracts out the logical differences between Launcher and RecentsActivity. */ diff --git a/quickstep/src/com/android/quickstep/OverviewInteractionState.java b/quickstep/src/com/android/quickstep/OverviewInteractionState.java index 224c8a708..d71c08ad5 100644 --- a/quickstep/src/com/android/quickstep/OverviewInteractionState.java +++ b/quickstep/src/com/android/quickstep/OverviewInteractionState.java @@ -27,7 +27,6 @@ import android.os.Handler; import android.os.Message; import android.os.RemoteException; import android.provider.Settings; -import android.support.annotation.WorkerThread; import android.util.Log; import com.android.launcher3.Utilities; @@ -36,6 +35,8 @@ import com.android.launcher3.util.MainThreadInitializedObject; import com.android.launcher3.util.UiThreadHelper; import com.android.systemui.shared.recents.ISystemUiProxy; +import androidx.annotation.WorkerThread; + /** * Sets overview interaction flags, such as: * diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java index a9b732639..196f0cc62 100644 --- a/quickstep/src/com/android/quickstep/RecentsModel.java +++ b/quickstep/src/com/android/quickstep/RecentsModel.java @@ -29,7 +29,6 @@ import android.os.Build; import android.os.Bundle; import android.os.RemoteException; import android.os.UserHandle; -import android.support.annotation.WorkerThread; import android.util.Log; import android.util.LruCache; import android.util.SparseArray; @@ -52,6 +51,8 @@ import com.android.systemui.shared.system.TaskStackChangeListener; import java.util.ArrayList; import java.util.function.Consumer; +import androidx.annotation.WorkerThread; + /** * Singleton class to load and manage recents model. */ diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java index c272b1a7e..72895167f 100644 --- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java +++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java @@ -18,7 +18,6 @@ package com.android.quickstep; import android.content.Context; import android.graphics.Matrix; -import android.support.annotation.AnyThread; import android.view.View; import com.android.launcher3.R; @@ -27,6 +26,8 @@ import com.android.launcher3.util.ResourceBasedOverride; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.recents.model.ThumbnailData; +import androidx.annotation.AnyThread; + /** * Factory class to create and add an overlays on the TaskView */ diff --git a/quickstep/src/com/android/quickstep/TouchConsumer.java b/quickstep/src/com/android/quickstep/TouchConsumer.java index 42e9aee1b..646fc57f2 100644 --- a/quickstep/src/com/android/quickstep/TouchConsumer.java +++ b/quickstep/src/com/android/quickstep/TouchConsumer.java @@ -17,7 +17,6 @@ package com.android.quickstep; import android.annotation.TargetApi; import android.os.Build; -import android.support.annotation.IntDef; import android.view.Choreographer; import android.view.MotionEvent; @@ -25,6 +24,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.function.Consumer; +import androidx.annotation.IntDef; + @TargetApi(Build.VERSION_CODES.O) @FunctionalInterface public interface TouchConsumer extends Consumer<MotionEvent> { diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java index f8ef49b31..66655bd3c 100644 --- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -43,9 +43,6 @@ import android.os.Handler; import android.os.Looper; import android.os.SystemClock; import android.os.UserHandle; -import android.support.annotation.AnyThread; -import android.support.annotation.UiThread; -import android.support.annotation.WorkerThread; import android.util.Log; import android.view.HapticFeedbackConstants; import android.view.View; @@ -86,11 +83,14 @@ import com.android.systemui.shared.system.RecentsAnimationControllerCompat; import com.android.systemui.shared.system.RemoteAnimationTargetCompat; import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier; import com.android.systemui.shared.system.WindowCallbacksCompat; -import com.android.systemui.shared.system.WindowManagerWrapper; import java.util.StringJoiner; import java.util.function.BiFunction; +import androidx.annotation.AnyThread; +import androidx.annotation.UiThread; +import androidx.annotation.WorkerThread; + @TargetApi(Build.VERSION_CODES.O) public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> { private static final String TAG = WindowTransformSwipeHandler.class.getSimpleName(); diff --git a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java index 0597a2ebd..c3ce4399e 100644 --- a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java +++ b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java @@ -29,7 +29,6 @@ import android.graphics.Rect; import android.graphics.RectF; import android.os.Build; import android.os.RemoteException; -import android.support.annotation.Nullable; import android.view.animation.Interpolator; import com.android.launcher3.BaseDraggingActivity; @@ -51,6 +50,8 @@ import com.android.systemui.shared.system.WindowManagerWrapper; import java.util.function.BiFunction; +import androidx.annotation.Nullable; + /** * Utility class to handle window clip animation */ diff --git a/quickstep/src/com/android/quickstep/util/LayoutUtils.java b/quickstep/src/com/android/quickstep/util/LayoutUtils.java index ec9c7eaed..7715f358a 100644 --- a/quickstep/src/com/android/quickstep/util/LayoutUtils.java +++ b/quickstep/src/com/android/quickstep/util/LayoutUtils.java @@ -20,14 +20,15 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; import android.content.Context; import android.content.res.Resources; import android.graphics.Rect; -import android.support.annotation.AnyThread; -import android.support.annotation.IntDef; import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import java.lang.annotation.Retention; +import androidx.annotation.AnyThread; +import androidx.annotation.IntDef; + public class LayoutUtils { private static final int MULTI_WINDOW_STRATEGY_HALF_SCREEN = 1; diff --git a/quickstep/src/com/android/quickstep/views/IconView.java b/quickstep/src/com/android/quickstep/views/IconView.java index 865994915..eb8da6e58 100644 --- a/quickstep/src/com/android/quickstep/views/IconView.java +++ b/quickstep/src/com/android/quickstep/views/IconView.java @@ -18,12 +18,15 @@ package com.android.quickstep.views; import android.content.Context; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; import android.util.AttributeSet; import android.view.View; + import com.android.launcher3.FastBitmapDrawable; + import java.util.ArrayList; +import androidx.annotation.NonNull; + /** * A view which draws a drawable stretched to fit its size. Unlike ImageView, it avoids relayout * when the drawable changes. diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 0326bbd92..f3dec9a81 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -44,7 +44,6 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Handler; import android.os.UserHandle; -import android.support.annotation.Nullable; import android.text.Layout; import android.text.StaticLayout; import android.text.TextPaint; @@ -95,6 +94,8 @@ import com.android.systemui.shared.system.TaskStackChangeListener; import java.util.ArrayList; import java.util.function.Consumer; +import androidx.annotation.Nullable; + /** * A list of recent tasks. */ diff --git a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java index 8b5e83245..896557550 100644 --- a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java +++ b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java @@ -15,11 +15,12 @@ */ package com.android.quickstep.views; -import static android.support.v4.graphics.ColorUtils.setAlphaComponent; import static com.android.launcher3.LauncherState.OVERVIEW; import static com.android.launcher3.anim.Interpolators.ACCEL; import static com.android.launcher3.anim.Interpolators.LINEAR; +import static androidx.core.graphics.ColorUtils.setAlphaComponent; + import android.content.Context; import android.graphics.Canvas; import android.graphics.Color; diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index e58e73d28..1c07ea4a7 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -25,7 +25,6 @@ import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustom import android.annotation.SuppressLint; import android.content.Context; -import android.support.annotation.IntDef; import android.util.AttributeSet; import android.util.Pair; import android.view.MotionEvent; @@ -40,6 +39,8 @@ import com.android.launcher3.views.BaseDragLayer; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import androidx.annotation.IntDef; + /** * Base class for a View which shows a floating UI on top of the launcher UI. */ diff --git a/src/com/android/launcher3/AllAppsList.java b/src/com/android/launcher3/AllAppsList.java index 5eb6cc72d..24826918f 100644 --- a/src/com/android/launcher3/AllAppsList.java +++ b/src/com/android/launcher3/AllAppsList.java @@ -22,8 +22,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.LauncherActivityInfo; import android.os.Process; import android.os.UserHandle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.Log; import com.android.launcher3.compat.LauncherAppsCompat; @@ -35,6 +33,9 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * Stores the list of all applications for the all apps view. diff --git a/src/com/android/launcher3/AppWidgetsRestoredReceiver.java b/src/com/android/launcher3/AppWidgetsRestoredReceiver.java index b249c9530..0250c363d 100644 --- a/src/com/android/launcher3/AppWidgetsRestoredReceiver.java +++ b/src/com/android/launcher3/AppWidgetsRestoredReceiver.java @@ -9,7 +9,6 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.os.Handler; -import android.support.annotation.WorkerThread; import android.util.Log; import com.android.launcher3.LauncherSettings.Favorites; @@ -18,6 +17,8 @@ import com.android.launcher3.model.LoaderTask; import com.android.launcher3.provider.RestoreDbTask; import com.android.launcher3.util.ContentWriter; +import androidx.annotation.WorkerThread; + public class AppWidgetsRestoredReceiver extends BroadcastReceiver { private static final String TAG = "AWRestoredReceiver"; diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index 6c82e6385..2ec7e012c 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java @@ -25,7 +25,6 @@ import android.content.Context; import android.content.ContextWrapper; import android.content.Intent; import android.content.res.Configuration; -import android.support.annotation.IntDef; import android.view.ContextThemeWrapper; import android.view.View.AccessibilityDelegate; @@ -41,6 +40,8 @@ import java.io.PrintWriter; import java.lang.annotation.Retention; import java.util.ArrayList; +import androidx.annotation.IntDef; + public abstract class BaseActivity extends Activity implements UserEventDelegate{ public static final int INVISIBLE_BY_STATE_HANDLER = 1 << 0; diff --git a/src/com/android/launcher3/BaseRecyclerView.java b/src/com/android/launcher3/BaseRecyclerView.java index 74b9cfaf3..f300ef740 100644 --- a/src/com/android/launcher3/BaseRecyclerView.java +++ b/src/com/android/launcher3/BaseRecyclerView.java @@ -17,7 +17,6 @@ package com.android.launcher3; import android.content.Context; -import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -25,6 +24,8 @@ import android.view.ViewGroup; import com.android.launcher3.views.RecyclerViewFastScroller; +import androidx.recyclerview.widget.RecyclerView; + /** * A base {@link RecyclerView}, which does the following: diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index fae199259..01e3a10b0 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -27,7 +27,6 @@ import android.graphics.Point; import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.v4.graphics.ColorUtils; import android.text.TextUtils.TruncateAt; import android.util.AttributeSet; import android.util.Property; @@ -52,6 +51,8 @@ import com.android.launcher3.model.PackageItemInfo; import java.text.NumberFormat; +import androidx.core.graphics.ColorUtils; + /** * TextView that draws a bubble behind the text. We cannot use a LineBackgroundSpan * because we want to make the bubble taller than the text and TextView's clip is diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index f52a4d675..f6f149631 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -37,9 +37,6 @@ import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Parcelable; -import android.os.SystemClock; -import android.support.annotation.IntDef; -import android.support.v4.view.ViewCompat; import android.util.ArrayMap; import android.util.AttributeSet; import android.util.Log; @@ -75,6 +72,9 @@ import java.util.Collections; import java.util.Comparator; import java.util.Stack; +import androidx.annotation.IntDef; +import androidx.core.view.ViewCompat; + public class CellLayout extends ViewGroup { public static final int WORKSPACE_ACCESSIBILITY_DRAG = 2; public static final int FOLDER_ACCESSIBILITY_DRAG = 1; diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java index f496600c7..abd5538c6 100644 --- a/src/com/android/launcher3/IconCache.java +++ b/src/com/android/launcher3/IconCache.java @@ -38,8 +38,6 @@ import android.os.Handler; import android.os.Process; import android.os.SystemClock; import android.os.UserHandle; -import android.support.annotation.NonNull; -import android.support.v4.graphics.ColorUtils; import android.text.TextUtils; import android.util.Log; @@ -63,6 +61,9 @@ import java.util.List; import java.util.Set; import java.util.Stack; +import androidx.annotation.NonNull; +import androidx.core.graphics.ColorUtils; + /** * Cache of application icons. Icons can be made from any thread. */ diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index 70845541b..f3f2238e3 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -22,7 +22,6 @@ import android.content.res.Configuration; import android.content.res.TypedArray; import android.content.res.XmlResourceParser; import android.graphics.Point; -import android.support.annotation.VisibleForTesting; import android.util.DisplayMetrics; import android.util.Xml; import android.view.Display; @@ -40,6 +39,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import androidx.annotation.VisibleForTesting; + public class InvariantDeviceProfile { // We do not need any synchronization for this variable as its only written on UI thread. diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 0dffed407..7f9932336 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -56,7 +56,6 @@ import android.os.Parcelable; import android.os.Process; import android.os.StrictMode; import android.os.UserHandle; -import android.support.annotation.Nullable; import android.text.TextUtils; import android.text.method.TextKeyListener; import android.util.Log; @@ -141,6 +140,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import androidx.annotation.Nullable; + /** * Default launcher application. */ diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 19aa795fe..fe9f901c4 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -31,7 +31,6 @@ import android.os.HandlerThread; import android.os.Looper; import android.os.Process; import android.os.UserHandle; -import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.Log; import android.util.Pair; @@ -74,6 +73,8 @@ import java.util.List; import java.util.concurrent.CancellationException; import java.util.concurrent.Executor; +import androidx.annotation.Nullable; + /** * Maintains in-memory state of the Launcher. It is expected that there should be only one * LauncherModel object held in a static. Also provide APIs for updating the database state diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java index 5bbfc1d79..fe3df95d2 100644 --- a/src/com/android/launcher3/LauncherStateManager.java +++ b/src/com/android/launcher3/LauncherStateManager.java @@ -17,6 +17,7 @@ package com.android.launcher3; import static android.view.View.VISIBLE; + import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE; import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE; @@ -34,7 +35,6 @@ import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; import android.os.Handler; import android.os.Looper; -import android.support.annotation.IntDef; import com.android.launcher3.anim.AnimationSuccessListener; import com.android.launcher3.anim.AnimatorPlaybackController; @@ -47,6 +47,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; +import androidx.annotation.IntDef; + /** * TODO: figure out what kind of tests we can write for this * diff --git a/src/com/android/launcher3/PromiseAppInfo.java b/src/com/android/launcher3/PromiseAppInfo.java index ea9f7527f..ea151cd58 100644 --- a/src/com/android/launcher3/PromiseAppInfo.java +++ b/src/com/android/launcher3/PromiseAppInfo.java @@ -18,11 +18,12 @@ package com.android.launcher3; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; import com.android.launcher3.compat.PackageInstallerCompat; import com.android.launcher3.util.PackageManagerHelper; +import androidx.annotation.NonNull; + public class PromiseAppInfo extends AppInfo { public int level = 0; diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java index 7af4bf979..84bad0858 100644 --- a/src/com/android/launcher3/WidgetPreviewLoader.java +++ b/src/com/android/launcher3/WidgetPreviewLoader.java @@ -25,7 +25,6 @@ import android.os.AsyncTask; import android.os.CancellationSignal; import android.os.Handler; import android.os.UserHandle; -import android.support.annotation.Nullable; import android.util.Log; import android.util.LongSparseArray; @@ -51,6 +50,8 @@ import java.util.WeakHashMap; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; +import androidx.annotation.Nullable; + public class WidgetPreviewLoader { private static final String TAG = "WidgetPreviewLoader"; diff --git a/src/com/android/launcher3/accessibility/DragAndDropAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/DragAndDropAccessibilityDelegate.java index bd3bb4d4b..117296d5f 100644 --- a/src/com/android/launcher3/accessibility/DragAndDropAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/DragAndDropAccessibilityDelegate.java @@ -19,8 +19,6 @@ package com.android.launcher3.accessibility; import android.content.Context; import android.graphics.Rect; import android.os.Bundle; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; -import android.support.v4.widget.ExploreByTouchHelper; import android.view.View; import android.view.View.OnClickListener; import android.view.accessibility.AccessibilityEvent; @@ -31,6 +29,9 @@ import com.android.launcher3.R; import java.util.List; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.customview.widget.ExploreByTouchHelper; + /** * Helper class to make drag-and-drop in a {@link CellLayout} accessible. */ diff --git a/src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java b/src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java index e6f120fe6..1c088dbdd 100644 --- a/src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java +++ b/src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java @@ -18,7 +18,6 @@ package com.android.launcher3.accessibility; import android.content.Context; import android.graphics.Rect; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; import android.text.TextUtils; import android.view.View; @@ -32,6 +31,8 @@ import com.android.launcher3.ShortcutInfo; import com.android.launcher3.accessibility.LauncherAccessibilityDelegate.DragType; import com.android.launcher3.dragndrop.DragLayer; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; + /** * Implementation of {@link DragAndDropAccessibilityDelegate} to support DnD on workspace. */ diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index cf7842a59..e5cda21f1 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -23,12 +23,6 @@ import android.graphics.Point; import android.graphics.Rect; import android.os.Bundle; import android.os.Process; -import android.support.animation.DynamicAnimation; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.text.Selection; import android.text.SpannableStringBuilder; import android.util.AttributeSet; @@ -59,6 +53,13 @@ import com.android.launcher3.views.BottomUserEducationView; import com.android.launcher3.views.RecyclerViewFastScroller; import com.android.launcher3.views.SpringRelativeLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.dynamicanimation.animation.DynamicAnimation; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + /** * The all apps view container. */ diff --git a/src/com/android/launcher3/allapps/AllAppsFastScrollHelper.java b/src/com/android/launcher3/allapps/AllAppsFastScrollHelper.java index e08cb15cd..3ee1293e2 100644 --- a/src/com/android/launcher3/allapps/AllAppsFastScrollHelper.java +++ b/src/com/android/launcher3/allapps/AllAppsFastScrollHelper.java @@ -15,13 +15,13 @@ */ package com.android.launcher3.allapps; -import android.support.v7.widget.RecyclerView; - import com.android.launcher3.util.Thunk; import java.util.HashSet; import java.util.List; +import androidx.recyclerview.widget.RecyclerView; + public class AllAppsFastScrollHelper implements AllAppsGridAdapter.BindViewCallback { private static final int INITIAL_TOUCH_SETTLING_DURATION = 100; diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index 27fc53a82..0f1355019 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -18,11 +18,6 @@ package com.android.launcher3.allapps; import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import android.support.v4.view.accessibility.AccessibilityEventCompat; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; -import android.support.v4.view.accessibility.AccessibilityRecordCompat; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -44,6 +39,12 @@ import com.android.launcher3.util.PackageManagerHelper; import java.util.List; +import androidx.core.view.accessibility.AccessibilityEventCompat; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.core.view.accessibility.AccessibilityRecordCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + /** * The grid view adapter of all the apps. */ diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java index a6c1346f6..adc4a72d1 100644 --- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java +++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java @@ -21,7 +21,6 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.util.SparseIntArray; import android.view.MotionEvent; @@ -41,6 +40,8 @@ import com.android.launcher3.views.RecyclerViewFastScroller; import java.util.List; +import androidx.recyclerview.widget.RecyclerView; + /** * A RecyclerView with custom fast scroll support for the all apps view. */ diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java index eaa777416..5348349f4 100644 --- a/src/com/android/launcher3/allapps/FloatingHeaderView.java +++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java @@ -19,9 +19,6 @@ import android.animation.ValueAnimator; import android.content.Context; import android.graphics.Point; import android.graphics.Rect; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -32,6 +29,10 @@ import android.widget.LinearLayout; import com.android.launcher3.R; import com.android.launcher3.anim.PropertySetter; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; + public class FloatingHeaderView extends LinearLayout implements ValueAnimator.AnimatorUpdateListener { diff --git a/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java index 31c5914b8..decdcc0aa 100644 --- a/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java +++ b/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java @@ -19,8 +19,6 @@ import android.content.Context; import android.content.SharedPreferences; import android.graphics.Canvas; import android.graphics.Paint; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.widget.Button; @@ -32,6 +30,9 @@ import com.android.launcher3.Utilities; import com.android.launcher3.pageindicators.PageIndicator; import com.android.launcher3.util.Themes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * Supports two indicator colors, dedicated for personal and work tabs. */ diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java index dcc45545a..91be504ef 100644 --- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java +++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java @@ -15,8 +15,6 @@ */ package com.android.launcher3.allapps.search; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompat.java b/src/com/android/launcher3/compat/AppWidgetManagerCompat.java index fd1f0cca2..32432561b 100644 --- a/src/com/android/launcher3/compat/AppWidgetManagerCompat.java +++ b/src/com/android/launcher3/compat/AppWidgetManagerCompat.java @@ -22,7 +22,6 @@ import android.content.ComponentName; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; -import android.support.annotation.Nullable; import com.android.launcher3.LauncherAppWidgetInfo; import com.android.launcher3.LauncherAppWidgetProviderInfo; @@ -35,6 +34,8 @@ import com.android.launcher3.widget.custom.CustomWidgetParser; import java.util.HashMap; import java.util.List; +import androidx.annotation.Nullable; + public abstract class AppWidgetManagerCompat { private static final Object sInstanceLock = new Object(); diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java b/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java index 843028503..106574832 100644 --- a/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java +++ b/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java @@ -23,7 +23,6 @@ import android.os.Bundle; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; -import android.support.annotation.Nullable; import com.android.launcher3.LauncherAppWidgetInfo; import com.android.launcher3.LauncherAppWidgetProviderInfo; @@ -38,6 +37,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; +import androidx.annotation.Nullable; + class AppWidgetManagerCompatVL extends AppWidgetManagerCompat { private final UserManager mUserManager; diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompatVO.java b/src/com/android/launcher3/compat/AppWidgetManagerCompatVO.java index 44158edbf..b7b0563ba 100644 --- a/src/com/android/launcher3/compat/AppWidgetManagerCompatVO.java +++ b/src/com/android/launcher3/compat/AppWidgetManagerCompatVO.java @@ -18,7 +18,6 @@ package com.android.launcher3.compat; import android.appwidget.AppWidgetProviderInfo; import android.content.Context; -import android.support.annotation.Nullable; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.util.PackageUserKey; @@ -26,6 +25,8 @@ import com.android.launcher3.util.PackageUserKey; import java.util.Collections; import java.util.List; +import androidx.annotation.Nullable; + class AppWidgetManagerCompatVO extends AppWidgetManagerCompatVL { AppWidgetManagerCompatVO(Context context) { diff --git a/src/com/android/launcher3/compat/LauncherAppsCompat.java b/src/com/android/launcher3/compat/LauncherAppsCompat.java index 2cac536f6..407355ce3 100644 --- a/src/com/android/launcher3/compat/LauncherAppsCompat.java +++ b/src/com/android/launcher3/compat/LauncherAppsCompat.java @@ -24,12 +24,15 @@ import android.content.pm.LauncherActivityInfo; import android.graphics.Rect; import android.os.Bundle; import android.os.UserHandle; -import android.support.annotation.Nullable; + import com.android.launcher3.Utilities; import com.android.launcher3.shortcuts.ShortcutInfoCompat; import com.android.launcher3.util.PackageUserKey; + import java.util.List; +import androidx.annotation.Nullable; + public abstract class LauncherAppsCompat { public interface OnAppsChangedCallbackCompat { diff --git a/src/com/android/launcher3/compat/LauncherAppsCompatVL.java b/src/com/android/launcher3/compat/LauncherAppsCompatVL.java index cc3e5a727..ba0ac6e4a 100644 --- a/src/com/android/launcher3/compat/LauncherAppsCompatVL.java +++ b/src/com/android/launcher3/compat/LauncherAppsCompatVL.java @@ -29,15 +29,18 @@ import android.graphics.Rect; import android.os.Bundle; import android.os.Process; import android.os.UserHandle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.ArrayMap; + import com.android.launcher3.compat.ShortcutConfigActivityInfo.ShortcutConfigActivityInfoVL; import com.android.launcher3.shortcuts.ShortcutInfoCompat; import com.android.launcher3.util.PackageUserKey; + import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + public class LauncherAppsCompatVL extends LauncherAppsCompat { protected final LauncherApps mLauncherApps; diff --git a/src/com/android/launcher3/compat/LauncherAppsCompatVO.java b/src/com/android/launcher3/compat/LauncherAppsCompatVO.java index 173d0d1f3..386b3b3fe 100644 --- a/src/com/android/launcher3/compat/LauncherAppsCompatVO.java +++ b/src/com/android/launcher3/compat/LauncherAppsCompatVO.java @@ -28,7 +28,6 @@ import android.os.Build; import android.os.Parcelable; import android.os.Process; import android.os.UserHandle; -import android.support.annotation.Nullable; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherModel; @@ -42,6 +41,8 @@ import com.android.launcher3.util.PackageUserKey; import java.util.ArrayList; import java.util.List; +import androidx.annotation.Nullable; + @TargetApi(26) public class LauncherAppsCompatVO extends LauncherAppsCompatVL { diff --git a/src/com/android/launcher3/compat/PackageInstallerCompat.java b/src/com/android/launcher3/compat/PackageInstallerCompat.java index 3270ba200..7dad7e905 100644 --- a/src/com/android/launcher3/compat/PackageInstallerCompat.java +++ b/src/com/android/launcher3/compat/PackageInstallerCompat.java @@ -19,11 +19,12 @@ package com.android.launcher3.compat; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageInstaller; -import android.support.annotation.NonNull; import java.util.HashMap; import java.util.List; +import androidx.annotation.NonNull; + public abstract class PackageInstallerCompat { public static final int STATUS_INSTALLED = 0; diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java index 7f30ffa34..6ac56ebed 100644 --- a/src/com/android/launcher3/dragndrop/DragView.java +++ b/src/com/android/launcher3/dragndrop/DragView.java @@ -41,9 +41,6 @@ import android.graphics.drawable.InsetDrawable; import android.os.Build; import android.os.Handler; import android.os.Looper; -import android.support.animation.FloatPropertyCompat; -import android.support.animation.SpringAnimation; -import android.support.animation.SpringForce; import android.view.View; import com.android.launcher3.FastBitmapDrawable; @@ -70,6 +67,10 @@ import com.android.launcher3.widget.PendingAddShortcutInfo; import java.util.Arrays; import java.util.List; +import androidx.dynamicanimation.animation.FloatPropertyCompat; +import androidx.dynamicanimation.animation.SpringAnimation; +import androidx.dynamicanimation.animation.SpringForce; + public class DragView extends View { private static final ColorMatrix sTempMatrix1 = new ColorMatrix(); private static final ColorMatrix sTempMatrix2 = new ColorMatrix(); diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java index 0c77f9ed1..6ef798d62 100644 --- a/src/com/android/launcher3/folder/FolderAnimationManager.java +++ b/src/com/android/launcher3/folder/FolderAnimationManager.java @@ -29,7 +29,6 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Rect; import android.graphics.drawable.GradientDrawable; -import android.support.v4.graphics.ColorUtils; import android.util.Property; import android.view.View; import android.view.animation.AnimationUtils; @@ -47,6 +46,8 @@ import com.android.launcher3.util.Themes; import java.util.List; +import androidx.core.graphics.ColorUtils; + /** * Manages the opening and closing animations for a {@link Folder}. * diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index a60216c53..87a079604 100644 --- a/src/com/android/launcher3/folder/FolderIcon.java +++ b/src/com/android/launcher3/folder/FolderIcon.java @@ -26,8 +26,6 @@ import android.graphics.Canvas; import android.graphics.Point; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.os.Parcelable; -import android.support.annotation.NonNull; import android.util.AttributeSet; import android.util.Property; import android.view.LayoutInflater; @@ -69,6 +67,8 @@ import com.android.launcher3.widget.PendingAddShortcutInfo; import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; + /** * An icon that can appear on in the workspace representing an {@link Folder}. */ diff --git a/src/com/android/launcher3/folder/PreviewBackground.java b/src/com/android/launcher3/folder/PreviewBackground.java index 86266e625..ceb1a8c37 100644 --- a/src/com/android/launcher3/folder/PreviewBackground.java +++ b/src/com/android/launcher3/folder/PreviewBackground.java @@ -30,7 +30,6 @@ import android.graphics.PorterDuffXfermode; import android.graphics.RadialGradient; import android.graphics.Region; import android.graphics.Shader; -import android.support.v4.graphics.ColorUtils; import android.util.Property; import android.view.View; @@ -40,6 +39,8 @@ import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.util.Themes; +import androidx.core.graphics.ColorUtils; + /** * This object represents a FolderIcon preview background. It stores drawing / measurement * information, handles drawing, and animation (accept state <--> rest state). diff --git a/src/com/android/launcher3/folder/PreviewItemManager.java b/src/com/android/launcher3/folder/PreviewItemManager.java index 1f69f6e76..0004e1e40 100644 --- a/src/com/android/launcher3/folder/PreviewItemManager.java +++ b/src/com/android/launcher3/folder/PreviewItemManager.java @@ -16,13 +16,17 @@ package com.android.launcher3.folder; +import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.ENTER_INDEX; +import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.EXIT_INDEX; +import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW; +import static com.android.launcher3.folder.FolderIcon.DROP_IN_ANIMATION_DURATION; + import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; import android.view.View; import android.widget.TextView; @@ -33,10 +37,7 @@ import com.android.launcher3.Utilities; import java.util.ArrayList; import java.util.List; -import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.ENTER_INDEX; -import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.EXIT_INDEX; -import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW; -import static com.android.launcher3.folder.FolderIcon.DROP_IN_ANIMATION_DURATION; +import androidx.annotation.NonNull; /** * Manages the drawing and animations of {@link PreviewItemDrawingParams} for a {@link FolderIcon}. diff --git a/src/com/android/launcher3/graphics/ColorScrim.java b/src/com/android/launcher3/graphics/ColorScrim.java index 96d93d83b..5c1081ac3 100644 --- a/src/com/android/launcher3/graphics/ColorScrim.java +++ b/src/com/android/launcher3/graphics/ColorScrim.java @@ -17,7 +17,6 @@ package com.android.launcher3.graphics; import android.graphics.Canvas; import android.graphics.Color; -import android.support.v4.graphics.ColorUtils; import android.view.View; import android.view.animation.Interpolator; @@ -25,6 +24,8 @@ import com.android.launcher3.R; import com.android.launcher3.anim.Interpolators; import com.android.launcher3.uioverrides.WallpaperColorInfo; +import androidx.core.graphics.ColorUtils; + /** * Simple scrim which draws a color */ diff --git a/src/com/android/launcher3/graphics/DrawableFactory.java b/src/com/android/launcher3/graphics/DrawableFactory.java index bbc013d50..5bc81e69a 100644 --- a/src/com/android/launcher3/graphics/DrawableFactory.java +++ b/src/com/android/launcher3/graphics/DrawableFactory.java @@ -28,9 +28,9 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Process; import android.os.UserHandle; -import android.support.annotation.UiThread; import android.util.ArrayMap; import android.util.Log; + import com.android.launcher3.FastBitmapDrawable; import com.android.launcher3.ItemInfoWithIcon; import com.android.launcher3.R; @@ -38,6 +38,8 @@ import com.android.launcher3.Utilities; import com.android.launcher3.allapps.AllAppsBackgroundDrawable; import com.android.launcher3.util.ResourceBasedOverride; +import androidx.annotation.UiThread; + /** * Factory for creating new drawables. */ diff --git a/src/com/android/launcher3/graphics/IconNormalizer.java b/src/com/android/launcher3/graphics/IconNormalizer.java index a2a08015e..df00815c0 100644 --- a/src/com/android/launcher3/graphics/IconNormalizer.java +++ b/src/com/android/launcher3/graphics/IconNormalizer.java @@ -24,22 +24,23 @@ import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.Path; import android.graphics.PorterDuff; -import android.graphics.PorterDuff.Mode; import android.graphics.PorterDuffXfermode; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.drawable.AdaptiveIconDrawable; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.Log; + import com.android.launcher3.LauncherAppState; import com.android.launcher3.Utilities; import com.android.launcher3.dragndrop.FolderAdaptiveIcon; import java.nio.ByteBuffer; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + public class IconNormalizer { private static final String TAG = "IconNormalizer"; diff --git a/src/com/android/launcher3/graphics/IconPalette.java b/src/com/android/launcher3/graphics/IconPalette.java index 9c3b77ece..cda07c31a 100644 --- a/src/com/android/launcher3/graphics/IconPalette.java +++ b/src/com/android/launcher3/graphics/IconPalette.java @@ -19,12 +19,13 @@ package com.android.launcher3.graphics; import android.app.Notification; import android.content.Context; import android.graphics.Color; -import android.support.v4.graphics.ColorUtils; import android.util.Log; import com.android.launcher3.R; import com.android.launcher3.util.Themes; +import androidx.core.graphics.ColorUtils; + /** * Contains colors based on the dominant color of an icon. */ diff --git a/src/com/android/launcher3/graphics/IconShapeOverride.java b/src/com/android/launcher3/graphics/IconShapeOverride.java index 223243b7a..cadc6e35e 100644 --- a/src/com/android/launcher3/graphics/IconShapeOverride.java +++ b/src/com/android/launcher3/graphics/IconShapeOverride.java @@ -30,7 +30,6 @@ import android.preference.ListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.provider.Settings; -import android.support.annotation.NonNull; import android.text.TextUtils; import android.util.Log; @@ -42,6 +41,8 @@ import com.android.launcher3.util.LooperExecutor; import java.lang.reflect.Field; +import androidx.annotation.NonNull; + /** * Utility class to override shape of {@link android.graphics.drawable.AdaptiveIconDrawable}. */ diff --git a/src/com/android/launcher3/graphics/LauncherIcons.java b/src/com/android/launcher3/graphics/LauncherIcons.java index 0167a1d9c..087362cd4 100644 --- a/src/com/android/launcher3/graphics/LauncherIcons.java +++ b/src/com/android/launcher3/graphics/LauncherIcons.java @@ -41,7 +41,6 @@ import android.graphics.drawable.PaintDrawable; import android.os.Build; import android.os.Process; import android.os.UserHandle; -import android.support.annotation.Nullable; import com.android.launcher3.AppInfo; import com.android.launcher3.FastBitmapDrawable; @@ -57,6 +56,8 @@ import com.android.launcher3.shortcuts.ShortcutInfoCompat; import com.android.launcher3.util.Provider; import com.android.launcher3.util.Themes; +import androidx.annotation.Nullable; + /** * Helper methods for generating various launcher icons */ diff --git a/src/com/android/launcher3/graphics/ShadowGenerator.java b/src/com/android/launcher3/graphics/ShadowGenerator.java index 52d45accf..d2d1699bf 100644 --- a/src/com/android/launcher3/graphics/ShadowGenerator.java +++ b/src/com/android/launcher3/graphics/ShadowGenerator.java @@ -27,10 +27,11 @@ import android.graphics.Paint; import android.graphics.PorterDuff; import android.graphics.PorterDuffXfermode; import android.graphics.RectF; -import android.support.v4.graphics.ColorUtils; import com.android.launcher3.LauncherAppState; +import androidx.core.graphics.ColorUtils; + /** * Utility class to add shadows to bitmaps. */ diff --git a/src/com/android/launcher3/graphics/TriangleShape.java b/src/com/android/launcher3/graphics/TriangleShape.java index cce4e3cd9..2c1572540 100644 --- a/src/com/android/launcher3/graphics/TriangleShape.java +++ b/src/com/android/launcher3/graphics/TriangleShape.java @@ -19,7 +19,8 @@ package com.android.launcher3.graphics; import android.graphics.Outline; import android.graphics.Path; import android.graphics.drawable.shapes.PathShape; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; /** * Wrapper around {@link android.graphics.drawable.shapes.PathShape} diff --git a/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java b/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java index bc4a06d5e..00cc1a7e2 100644 --- a/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java +++ b/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java @@ -34,7 +34,6 @@ import android.graphics.RectF; import android.graphics.Region; import android.graphics.Shader; import android.graphics.drawable.Drawable; -import android.support.v4.graphics.ColorUtils; import android.util.DisplayMetrics; import android.util.Property; import android.view.View; @@ -47,6 +46,8 @@ import com.android.launcher3.Workspace; import com.android.launcher3.uioverrides.WallpaperColorInfo; import com.android.launcher3.util.Themes; +import androidx.core.graphics.ColorUtils; + /** * View scrim which draws behind hotseat and workspace */ diff --git a/src/com/android/launcher3/keyboard/FocusedItemDecorator.java b/src/com/android/launcher3/keyboard/FocusedItemDecorator.java index 05ae406e8..2476a6fd3 100644 --- a/src/com/android/launcher3/keyboard/FocusedItemDecorator.java +++ b/src/com/android/launcher3/keyboard/FocusedItemDecorator.java @@ -17,14 +17,15 @@ package com.android.launcher3.keyboard; import android.graphics.Canvas; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ItemDecoration; -import android.support.v7.widget.RecyclerView.State; import android.view.View; import android.view.View.OnFocusChangeListener; import com.android.launcher3.keyboard.FocusIndicatorHelper.SimpleFocusIndicatorHelper; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ItemDecoration; +import androidx.recyclerview.widget.RecyclerView.State; + /** * {@link ItemDecoration} for drawing and animating focused view background. */ diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java index 7087fdb78..a318dc0eb 100644 --- a/src/com/android/launcher3/logging/UserEventDispatcher.java +++ b/src/com/android/launcher3/logging/UserEventDispatcher.java @@ -32,7 +32,6 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.os.SystemClock; -import android.support.annotation.Nullable; import android.util.Log; import android.view.View; import android.view.ViewParent; @@ -55,6 +54,8 @@ import com.android.launcher3.util.ResourceBasedOverride; import java.util.Locale; import java.util.UUID; +import androidx.annotation.Nullable; + /** * Manages the creation of {@link LauncherEvent}. * To debug this class, execute following command before side loading a new apk. diff --git a/src/com/android/launcher3/model/ModelPreload.java b/src/com/android/launcher3/model/ModelPreload.java index f186e9572..b353810ef 100644 --- a/src/com/android/launcher3/model/ModelPreload.java +++ b/src/com/android/launcher3/model/ModelPreload.java @@ -16,7 +16,6 @@ package com.android.launcher3.model; import android.content.Context; -import android.support.annotation.WorkerThread; import android.util.Log; import com.android.launcher3.AllAppsList; @@ -26,6 +25,8 @@ import com.android.launcher3.LauncherModel.ModelUpdateTask; import java.util.concurrent.Executor; +import androidx.annotation.WorkerThread; + /** * Utility class to preload LauncherModel */ diff --git a/src/com/android/launcher3/model/WidgetsModel.java b/src/com/android/launcher3/model/WidgetsModel.java index 9f8f2632e..448ff6c92 100644 --- a/src/com/android/launcher3/model/WidgetsModel.java +++ b/src/com/android/launcher3/model/WidgetsModel.java @@ -8,7 +8,6 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.Process; import android.os.UserHandle; -import android.support.annotation.Nullable; import android.util.Log; import com.android.launcher3.AppFilter; @@ -34,6 +33,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import androidx.annotation.Nullable; + /** * Widgets data model that is used by the adapters of the widget views and controllers. * diff --git a/src/com/android/launcher3/notification/NotificationKeyData.java b/src/com/android/launcher3/notification/NotificationKeyData.java index bf7ae1a5c..508cf877c 100644 --- a/src/com/android/launcher3/notification/NotificationKeyData.java +++ b/src/com/android/launcher3/notification/NotificationKeyData.java @@ -18,11 +18,12 @@ package com.android.launcher3.notification; import android.app.Notification; import android.service.notification.StatusBarNotification; -import android.support.annotation.NonNull; import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; + /** * The key data associated with the notification, used to determine what to include * in badges and dummy popup views before they are populated. diff --git a/src/com/android/launcher3/notification/NotificationListener.java b/src/com/android/launcher3/notification/NotificationListener.java index ac5aaf853..4c85c8b17 100644 --- a/src/com/android/launcher3/notification/NotificationListener.java +++ b/src/com/android/launcher3/notification/NotificationListener.java @@ -27,7 +27,6 @@ import android.os.Looper; import android.os.Message; import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; -import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; @@ -45,6 +44,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import androidx.annotation.Nullable; + /** * A {@link NotificationListenerService} that sends updates to its * {@link NotificationsChangedListener} when notifications are posted or canceled, diff --git a/src/com/android/launcher3/popup/PopupDataProvider.java b/src/com/android/launcher3/popup/PopupDataProvider.java index f1b8ec093..3faec447a 100644 --- a/src/com/android/launcher3/popup/PopupDataProvider.java +++ b/src/com/android/launcher3/popup/PopupDataProvider.java @@ -18,7 +18,6 @@ package com.android.launcher3.popup; import android.content.ComponentName; import android.service.notification.StatusBarNotification; -import android.support.annotation.NonNull; import android.util.Log; import com.android.launcher3.ItemInfo; @@ -41,6 +40,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import androidx.annotation.NonNull; + /** * Provides data for the popup menu that appears after long-clicking on apps. */ diff --git a/src/com/android/launcher3/popup/PopupPopulator.java b/src/com/android/launcher3/popup/PopupPopulator.java index b295bb2ae..450062961 100644 --- a/src/com/android/launcher3/popup/PopupPopulator.java +++ b/src/com/android/launcher3/popup/PopupPopulator.java @@ -20,8 +20,6 @@ import android.content.ComponentName; import android.os.Handler; import android.os.UserHandle; import android.service.notification.StatusBarNotification; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; import com.android.launcher3.ItemInfo; import com.android.launcher3.Launcher; @@ -40,6 +38,9 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + /** * Contains logic relevant to populating a {@link PopupContainerWithArrow}. In particular, * this class determines which items appear in the container, and in what order. diff --git a/src/com/android/launcher3/touch/SwipeDetector.java b/src/com/android/launcher3/touch/SwipeDetector.java index 703e4fdab..6ffc0efae 100644 --- a/src/com/android/launcher3/touch/SwipeDetector.java +++ b/src/com/android/launcher3/touch/SwipeDetector.java @@ -19,12 +19,13 @@ import static android.view.MotionEvent.INVALID_POINTER_ID; import android.content.Context; import android.graphics.PointF; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; import android.util.Log; import android.view.MotionEvent; import android.view.ViewConfiguration; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + /** * One dimensional scroll/drag/swipe gesture detector. * diff --git a/src/com/android/launcher3/util/ListViewHighlighter.java b/src/com/android/launcher3/util/ListViewHighlighter.java index ecad2afe2..360546e53 100644 --- a/src/com/android/launcher3/util/ListViewHighlighter.java +++ b/src/com/android/launcher3/util/ListViewHighlighter.java @@ -21,7 +21,6 @@ import android.animation.ValueAnimator; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.v4.graphics.ColorUtils; import android.view.View; import android.view.View.OnLayoutChangeListener; import android.widget.AbsListView; @@ -31,6 +30,8 @@ import android.widget.ListView; import com.android.launcher3.R; +import androidx.core.graphics.ColorUtils; + /** * Utility class to scroll and highlight a list view item */ diff --git a/src/com/android/launcher3/views/DoubleShadowBubbleTextView.java b/src/com/android/launcher3/views/DoubleShadowBubbleTextView.java index a11a8c537..64e166eeb 100644 --- a/src/com/android/launcher3/views/DoubleShadowBubbleTextView.java +++ b/src/com/android/launcher3/views/DoubleShadowBubbleTextView.java @@ -20,13 +20,14 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Color; -import android.support.v4.graphics.ColorUtils; import android.util.AttributeSet; import android.widget.TextView; import com.android.launcher3.BubbleTextView; import com.android.launcher3.R; +import androidx.core.graphics.ColorUtils; + /** * Extension of {@link BubbleTextView} which draws two shadows on the text (ambient and key shadows} */ diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java index dc6d2ff09..3e58ea673 100644 --- a/src/com/android/launcher3/views/OptionsPopupView.java +++ b/src/com/android/launcher3/views/OptionsPopupView.java @@ -22,7 +22,6 @@ import android.content.Context; import android.content.Intent; import android.graphics.Rect; import android.graphics.RectF; -import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.ArrayMap; import android.util.AttributeSet; @@ -44,6 +43,8 @@ import com.android.launcher3.widget.WidgetsFullSheet; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * Popup shown on long pressing an empty space in launcher */ diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java index ed1cf4f1e..f0d6de20f 100644 --- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java +++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java @@ -24,7 +24,6 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Point; import android.graphics.Rect; -import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.util.Property; import android.view.MotionEvent; @@ -35,10 +34,11 @@ import android.widget.TextView; import com.android.launcher3.BaseRecyclerView; import com.android.launcher3.R; import com.android.launcher3.Utilities; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.graphics.FastScrollThumbDrawable; import com.android.launcher3.util.Themes; +import androidx.recyclerview.widget.RecyclerView; + /** * The track and scrollbar that shows when you scroll the list. */ diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java index 7066980a9..6fd84db26 100644 --- a/src/com/android/launcher3/views/ScrimView.java +++ b/src/com/android/launcher3/views/ScrimView.java @@ -16,8 +16,6 @@ package com.android.launcher3.views; import static android.content.Context.ACCESSIBILITY_SERVICE; -import static android.support.v4.graphics.ColorUtils.compositeColors; -import static android.support.v4.graphics.ColorUtils.setAlphaComponent; import static android.view.MotionEvent.ACTION_DOWN; import static com.android.launcher3.LauncherState.ALL_APPS; @@ -25,6 +23,9 @@ import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.anim.Interpolators.ACCEL; import static com.android.launcher3.anim.Interpolators.DEACCEL; +import static androidx.core.graphics.ColorUtils.compositeColors; +import static androidx.core.graphics.ColorUtils.setAlphaComponent; + import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.Keyframe; @@ -38,12 +39,6 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat; -import android.support.v4.widget.ExploreByTouchHelper; import android.util.AttributeSet; import android.util.Property; import android.view.KeyEvent; @@ -68,6 +63,13 @@ import com.android.launcher3.util.Themes; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.view.ViewCompat; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat; +import androidx.customview.widget.ExploreByTouchHelper; + /** * Simple scrim which draws a flat color */ diff --git a/src/com/android/launcher3/views/SpringRelativeLayout.java b/src/com/android/launcher3/views/SpringRelativeLayout.java index b0313ceab..d0ec9d7e0 100644 --- a/src/com/android/launcher3/views/SpringRelativeLayout.java +++ b/src/com/android/launcher3/views/SpringRelativeLayout.java @@ -15,24 +15,25 @@ */ package com.android.launcher3.views; +import static androidx.dynamicanimation.animation.SpringForce.DAMPING_RATIO_MEDIUM_BOUNCY; +import static androidx.dynamicanimation.animation.SpringForce.STIFFNESS_LOW; +import static androidx.dynamicanimation.animation.SpringForce.STIFFNESS_MEDIUM; + import android.content.Context; import android.graphics.Canvas; -import android.support.animation.DynamicAnimation; -import android.support.animation.FloatPropertyCompat; -import android.support.animation.SpringAnimation; -import android.support.animation.SpringForce; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.EdgeEffectFactory; import android.util.AttributeSet; import android.util.SparseBooleanArray; import android.view.View; import android.widget.EdgeEffect; import android.widget.RelativeLayout; -import static android.support.animation.SpringForce.DAMPING_RATIO_MEDIUM_BOUNCY; -import static android.support.animation.SpringForce.STIFFNESS_LOW; -import static android.support.animation.SpringForce.STIFFNESS_MEDIUM; +import androidx.annotation.NonNull; +import androidx.dynamicanimation.animation.DynamicAnimation; +import androidx.dynamicanimation.animation.FloatPropertyCompat; +import androidx.dynamicanimation.animation.SpringAnimation; +import androidx.dynamicanimation.animation.SpringForce; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory; public class SpringRelativeLayout extends RelativeLayout { diff --git a/src/com/android/launcher3/widget/WidgetsDiffReporter.java b/src/com/android/launcher3/widget/WidgetsDiffReporter.java index d67f40365..2ba672d7a 100644 --- a/src/com/android/launcher3/widget/WidgetsDiffReporter.java +++ b/src/com/android/launcher3/widget/WidgetsDiffReporter.java @@ -16,7 +16,6 @@ package com.android.launcher3.widget; -import android.support.v7.widget.RecyclerView; import android.util.Log; import com.android.launcher3.IconCache; @@ -26,6 +25,8 @@ import com.android.launcher3.widget.WidgetsListAdapter.WidgetListRowEntryCompara import java.util.ArrayList; import java.util.Iterator; +import androidx.recyclerview.widget.RecyclerView; + /** * Do diff on widget's tray list items and call the {@link RecyclerView.Adapter} * methods accordingly. diff --git a/src/com/android/launcher3/widget/WidgetsFullSheet.java b/src/com/android/launcher3/widget/WidgetsFullSheet.java index 2a7bb03aa..f7ff69abe 100644 --- a/src/com/android/launcher3/widget/WidgetsFullSheet.java +++ b/src/com/android/launcher3/widget/WidgetsFullSheet.java @@ -20,7 +20,6 @@ import android.animation.AnimatorListenerAdapter; import android.animation.PropertyValuesHolder; import android.content.Context; import android.graphics.Rect; -import android.support.annotation.VisibleForTesting; import android.util.AttributeSet; import android.util.Pair; import android.view.LayoutInflater; @@ -36,6 +35,8 @@ import com.android.launcher3.R; import com.android.launcher3.views.RecyclerViewFastScroller; import com.android.launcher3.views.TopRoundedCornerView; +import androidx.annotation.VisibleForTesting; + /** * Popup for showing the full list of available widgets */ diff --git a/src/com/android/launcher3/widget/WidgetsListAdapter.java b/src/com/android/launcher3/widget/WidgetsListAdapter.java index 0147ea427..1016d0400 100644 --- a/src/com/android/launcher3/widget/WidgetsListAdapter.java +++ b/src/com/android/launcher3/widget/WidgetsListAdapter.java @@ -16,8 +16,6 @@ package com.android.launcher3.widget; import android.content.Context; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.Adapter; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -30,14 +28,15 @@ import com.android.launcher3.R; import com.android.launcher3.WidgetPreviewLoader; import com.android.launcher3.model.WidgetItem; import com.android.launcher3.util.LabelComparator; -import com.android.launcher3.util.PackageUserKey; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.Iterator; import java.util.List; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.Adapter; + /** * List view adapter for the widget tray. * diff --git a/src/com/android/launcher3/widget/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/WidgetsRecyclerView.java index 124058ec4..641183a01 100644 --- a/src/com/android/launcher3/widget/WidgetsRecyclerView.java +++ b/src/com/android/launcher3/widget/WidgetsRecyclerView.java @@ -18,9 +18,6 @@ package com.android.launcher3.widget; import android.content.Context; import android.graphics.Point; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.OnItemTouchListener; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -28,6 +25,10 @@ import android.view.View; import com.android.launcher3.BaseRecyclerView; import com.android.launcher3.R; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener; + /** * The widgets recycler view. */ diff --git a/src/com/android/launcher3/widget/WidgetsRowViewHolder.java b/src/com/android/launcher3/widget/WidgetsRowViewHolder.java index 8f269a643..d26edb613 100644 --- a/src/com/android/launcher3/widget/WidgetsRowViewHolder.java +++ b/src/com/android/launcher3/widget/WidgetsRowViewHolder.java @@ -15,12 +15,13 @@ */ package com.android.launcher3.widget; -import android.support.v7.widget.RecyclerView.ViewHolder; import android.view.ViewGroup; import com.android.launcher3.BubbleTextView; import com.android.launcher3.R; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; + public class WidgetsRowViewHolder extends ViewHolder { public final ViewGroup cellContainer; diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java index 21b324f07..5a1f9caa5 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java @@ -17,9 +17,6 @@ package com.android.launcher3.uioverrides.dynamicui; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.graphics.ColorUtils; import android.util.Log; import android.util.Pair; import android.util.Range; @@ -30,6 +27,10 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.graphics.ColorUtils; + /** * Implementation of tonal color extraction **/ diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java index 5c533ff34..0fd0a3531 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java @@ -17,10 +17,11 @@ package com.android.launcher3.uioverrides.dynamicui; import android.content.Context; -import android.support.annotation.Nullable; import com.android.launcher3.Utilities; +import androidx.annotation.Nullable; + public abstract class WallpaperManagerCompat { private static final Object sInstanceLock = new Object(); diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java index 7529f17f4..788344254 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java @@ -41,7 +41,6 @@ import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.HandlerThread; import android.os.ParcelFileDescriptor; -import android.support.annotation.Nullable; import android.util.Log; import android.util.Pair; @@ -51,6 +50,8 @@ import com.android.launcher3.graphics.ColorExtractor; import java.io.IOException; import java.util.ArrayList; +import androidx.annotation.Nullable; + public class WallpaperManagerCompatVL extends WallpaperManagerCompat { private static final String TAG = "WMCompatVL"; diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java index 4509e05aa..f34497deb 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java @@ -21,11 +21,12 @@ import android.app.WallpaperManager; import android.app.WallpaperManager.OnColorsChangedListener; import android.content.Context; import android.graphics.Color; -import android.support.annotation.Nullable; import android.util.Log; import java.lang.reflect.Method; +import androidx.annotation.Nullable; + @TargetApi(27) public class WallpaperManagerCompatVOMR1 extends WallpaperManagerCompat { diff --git a/tests/Android.mk b/tests/Android.mk index 180fc0cb3..1531c32df 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -17,8 +17,11 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator mockito-target-minus-junit4 \ - ub-launcher-aosp-tapl +LOCAL_STATIC_JAVA_LIBRARIES := \ + android-support-test \ + ub-uiautomator \ + mockito-target-minus-junit4 \ + ub-launcher-aosp-tapl LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml @@ -36,7 +39,11 @@ include $(BUILD_PACKAGE) # Build rule for Tapl library. # include $(CLEAR_VARS) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator libSharedSystemUI +LOCAL_STATIC_JAVA_LIBRARIES := \ + androidx.annotation_annotation \ + android-support-test \ + ub-uiautomator \ + libSharedSystemUI LOCAL_SRC_FILES := $(call all-java-files-under, tapl) \ ../quickstep/src/com/android/quickstep/SwipeUpSetting.java diff --git a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java index b217847f5..5d5af4f24 100644 --- a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java +++ b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java @@ -18,7 +18,6 @@ import android.graphics.Bitmap.Config; import android.graphics.Color; import android.os.Process; import android.os.UserHandle; -import android.support.annotation.NonNull; import android.support.test.InstrumentationRegistry; import android.support.test.rule.provider.ProviderTestRule; @@ -49,6 +48,8 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.Executor; +import androidx.annotation.NonNull; + /** * Base class for writing tests for Model update tasks. */ diff --git a/tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java b/tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java index 0185f130e..5befeb9ab 100644 --- a/tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java +++ b/tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java @@ -15,6 +15,11 @@ */ package com.android.launcher3.widget; +import static org.mockito.Matchers.eq; +import static org.mockito.Matchers.isNull; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + import android.appwidget.AppWidgetProviderInfo; import android.content.Context; import android.content.pm.PackageManager; @@ -22,7 +27,6 @@ import android.graphics.Bitmap; import android.support.test.InstrumentationRegistry; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import com.android.launcher3.IconCache; @@ -43,10 +47,7 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.Map; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isNull; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; +import androidx.recyclerview.widget.RecyclerView; @SmallTest @RunWith(AndroidJUnit4.class) diff --git a/tests/tapl/com/android/launcher3/tapl/AllApps.java b/tests/tapl/com/android/launcher3/tapl/AllApps.java index e270b4605..d64f86cbc 100644 --- a/tests/tapl/com/android/launcher3/tapl/AllApps.java +++ b/tests/tapl/com/android/launcher3/tapl/AllApps.java @@ -18,11 +18,12 @@ package com.android.launcher3.tapl; import static org.junit.Assert.assertTrue; -import android.support.annotation.NonNull; import android.support.test.uiautomator.BySelector; import android.support.test.uiautomator.Direction; import android.support.test.uiautomator.UiObject2; +import androidx.annotation.NonNull; + /** * Operations on AllApps opened from Home. Also a parent for All Apps opened from Overview. */ diff --git a/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java b/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java index 7ed2dc2f6..07e73fc9b 100644 --- a/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java +++ b/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java @@ -17,9 +17,10 @@ package com.android.launcher3.tapl; import android.graphics.Point; -import android.support.annotation.NonNull; import android.support.test.uiautomator.UiObject2; +import androidx.annotation.NonNull; + /** * Operations on AllApps opened from Overview. */ diff --git a/tests/tapl/com/android/launcher3/tapl/Home.java b/tests/tapl/com/android/launcher3/tapl/Home.java index 436e5ff6b..786f260b8 100644 --- a/tests/tapl/com/android/launcher3/tapl/Home.java +++ b/tests/tapl/com/android/launcher3/tapl/Home.java @@ -16,9 +16,10 @@ package com.android.launcher3.tapl; -import android.support.annotation.NonNull; import android.support.test.uiautomator.UiObject2; +import androidx.annotation.NonNull; + /** * Operations on the home screen. * diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index b02ff93bc..fa282c333 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -26,8 +26,6 @@ import android.app.ActivityManager; import android.app.UiAutomation; import android.os.Bundle; import android.provider.Settings; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.support.test.InstrumentationRegistry; import android.support.test.uiautomator.By; import android.support.test.uiautomator.BySelector; @@ -41,6 +39,9 @@ import com.android.quickstep.SwipeUpSetting; import java.lang.ref.WeakReference; import java.util.concurrent.TimeoutException; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * The main tapl object. The only object that can be explicitly constructed by the using code. It * produces all other objects. diff --git a/tests/tapl/com/android/launcher3/tapl/Overview.java b/tests/tapl/com/android/launcher3/tapl/Overview.java index 949399074..3c0ae2daf 100644 --- a/tests/tapl/com/android/launcher3/tapl/Overview.java +++ b/tests/tapl/com/android/launcher3/tapl/Overview.java @@ -19,13 +19,14 @@ package com.android.launcher3.tapl; import static org.junit.Assert.assertNotEquals; import android.graphics.Point; -import android.support.annotation.NonNull; import android.support.test.uiautomator.Direction; import android.support.test.uiautomator.UiObject2; import java.util.Collections; import java.util.List; +import androidx.annotation.NonNull; + /** * Overview pane. */ diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java index 045ab5fcf..c58c24443 100644 --- a/tests/tapl/com/android/launcher3/tapl/Workspace.java +++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java @@ -19,12 +19,13 @@ package com.android.launcher3.tapl; import static junit.framework.TestCase.assertTrue; import android.graphics.Point; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.support.test.uiautomator.Direction; import android.support.test.uiautomator.UiObject2; import android.view.KeyEvent; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * Operations on the workspace screen. */ |