Migrate setup-wizard-lib to androidx.

Test: make setup-wizard-lib
Bug: 76692459
Change-Id: I40171e973d442b1a1815e9e7d7c2cc984cb38bac

library/Android.mk

@@ -7,7 +7,7 @@ include $(CLEAR_VARS)
 
 LOCAL_USE_AAPT2 := true
 LOCAL_JAVA_LIBRARIES := \
-    android-support-annotations
+    androidx.annotation_annotation
 LOCAL_MANIFEST_FILE := main/AndroidManifest.xml
 LOCAL_MODULE := setup-wizard-lib
 LOCAL_RESOURCE_DIR := \
@@ -40,12 +40,12 @@ LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-java-files-under, main/src gingerbread/src recyclerview/src)
 
 LOCAL_JAVA_LIBRARIES := \
-    android-support-annotations
+    androidx.annotation_annotation
 
 LOCAL_SHARED_ANDROID_LIBRARIES := \
-    android-support-compat \
-    android-support-core-ui \
-    android-support-v7-appcompat \
-    android-support-v7-recyclerview
+    androidx.core_core \
+    androidx.legacy_legacy-support-core-ui \
+    androidx.appcompat_appcompat \
+    androidx.recyclerview_recyclerview
 
 include $(BUILD_STATIC_JAVA_LIBRARY)

library/common-gingerbread.mk

@@ -19,10 +19,10 @@ ifeq (,$(findstring setup-wizard-lib-gingerbread-compat,$(LOCAL_STATIC_ANDROID_L
   LOCAL_STATIC_ANDROID_LIBRARIES += setup-wizard-lib-gingerbread-compat
 endif
 
-ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
-  LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-appcompat
+ifeq (,$(findstring androidx.appcompat_appcompat,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
+  LOCAL_STATIC_ANDROID_LIBRARIES += androidx.appcompat_appcompat
 endif
 
-ifeq (,$(findstring android-support-v7-recyclerview,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
-  LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-recyclerview
+ifeq (,$(findstring androidx.recyclerview_recyclerview,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
+  LOCAL_STATIC_ANDROID_LIBRARIES += androidx.recyclerview_recyclerview
 endif

library/gingerbread/res/layout/suw_items_expandable_switch.xml

@@ -97,7 +97,7 @@
         android:layout_marginTop="@dimen/suw_switch_divider_padding_top"
         android:background="?android:attr/listDivider" />
 
-    <android.support.v7.widget.SwitchCompat
+    <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/suw_items_switch"
         style="@style/SuwSwitchStyle.Divided"
         android:layout_width="wrap_content"

library/gingerbread/res/layout/suw_items_switch.xml

@@ -66,7 +66,7 @@
 
     </LinearLayout>
 
-    <android.support.v7.widget.SwitchCompat
+    <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/suw_items_switch"
         style="@style/SuwSwitchStyle"
         android:layout_width="wrap_content"

library/gingerbread/src/com/android/setupwizardlib/items/SwitchItem.java

@@ -18,11 +18,12 @@ package com.android.setupwizardlib.items;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.v7.widget.SwitchCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.CompoundButton;
 
+import androidx.appcompat.widget.SwitchCompat;
+
 import com.android.setupwizardlib.R;
 
 /**

library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java

@@ -19,12 +19,6 @@ package com.android.setupwizardlib.util;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.view.AccessibilityDelegateCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeProviderCompat;
-import android.support.v4.widget.ExploreByTouchHelper;
 import android.text.Layout;
 import android.text.Spanned;
 import android.text.style.ClickableSpan;
@@ -35,6 +29,13 @@ import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.core.view.accessibility.AccessibilityNodeProviderCompat;
+import androidx.customview.widget.ExploreByTouchHelper;
+
 import java.util.List;
 
 /**
@@ -63,7 +64,7 @@ import java.util.List;
  * </pre>
  *
  * @see com.android.setupwizardlib.view.RichTextView
- * @see android.support.v4.widget.ExploreByTouchHelper
+ * @see androidx.customview.widget.ExploreByTouchHelper
  */
 public class LinkAccessibilityHelper extends AccessibilityDelegateCompat {
 

library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java

@@ -23,10 +23,11 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.os.Build;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.widget.Button;
 
+import androidx.annotation.NonNull;
+
 /**
  * Button for navigation bar, which includes tinting of its compound drawables to be used for dark
  * and light themes.

library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java

@@ -20,8 +20,6 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.AppCompatTextView;
 import android.text.Annotation;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -32,6 +30,9 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.MotionEvent;
 
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.core.view.ViewCompat;
+
 import com.android.setupwizardlib.span.LinkSpan;
 import com.android.setupwizardlib.span.LinkSpan.OnLinkClickListener;
 import com.android.setupwizardlib.span.SpanHelper;

library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java

@@ -18,7 +18,6 @@ package com.android.setupwizardlib.items;
 
 import static org.junit.Assert.assertTrue;
 
-import android.support.annotation.StyleRes;
 import android.support.test.annotation.UiThreadTest;
 import android.support.test.filters.SmallTest;
 import android.support.test.rule.UiThreadTestRule;
@@ -27,6 +26,8 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.LinearLayout;
 
+import androidx.annotation.StyleRes;
+
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.test.util.DrawingTestHelper;
 

library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/test/util/DrawingTestActivity.java

@@ -16,7 +16,7 @@
 
 package com.android.setupwizardlib.test.util;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * Activity to test view and drawable drawing behaviors. This is used to make sure that the drawing

library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/util/LinkAccessibilityHelperTest.java

@@ -28,10 +28,6 @@ import android.os.Bundle;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
-import android.support.v4.text.BidiFormatter;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
-import android.support.v4.widget.ExploreByTouchHelper;
 import android.text.SpannableStringBuilder;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
@@ -41,6 +37,11 @@ import android.view.accessibility.AccessibilityEvent;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
+import androidx.core.text.BidiFormatter;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
+import androidx.customview.widget.ExploreByTouchHelper;
+
 import com.android.setupwizardlib.span.LinkSpan;
 import com.android.setupwizardlib.util.LinkAccessibilityHelper.PreOLinkAccessibilityHelper;
 

library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java

@@ -23,7 +23,6 @@ import static org.robolectric.RuntimeEnvironment.application;
 
 import android.annotation.TargetApi;
 import android.os.Build.VERSION_CODES;
-import android.support.v7.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -31,6 +30,8 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.appcompat.widget.SwitchCompat;
+
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 

library/main/src/com/android/setupwizardlib/GlifLayout.java

@@ -24,9 +24,6 @@ import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -36,6 +33,10 @@ import android.widget.ProgressBar;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.android.setupwizardlib.template.ButtonFooterMixin;
 import com.android.setupwizardlib.template.ColoredHeaderMixin;
 import com.android.setupwizardlib.template.HeaderMixin;

library/main/src/com/android/setupwizardlib/GlifPatternDrawable.java

@@ -31,8 +31,9 @@ import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 
 import java.lang.ref.SoftReference;
 

library/main/src/com/android/setupwizardlib/SetupWizardItemsLayout.java

@@ -17,10 +17,11 @@
 package com.android.setupwizardlib;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.ListAdapter;
 
+import androidx.annotation.Nullable;
+
 import com.android.setupwizardlib.items.ItemAdapter;
 
 /**

library/main/src/com/android/setupwizardlib/TemplateLayout.java

@@ -20,9 +20,6 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.Keep;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.StyleRes;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -30,6 +27,10 @@ import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
 
+import androidx.annotation.Keep;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.StyleRes;
+
 import com.android.setupwizardlib.template.Mixin;
 import com.android.setupwizardlib.util.FallbackThemeWrapper;
 
@@ -229,7 +230,7 @@ public class TemplateLayout extends FrameLayout {
      * stripped out by proguard when using this with {@link android.animation.ObjectAnimator}. You
      * may need to add
      * <code>
-     *     -keep @android.support.annotation.Keep class *
+     *     -keep @androidx.annotation.Keep class *
      * </code>
      * to your proguard configuration if you are seeing mysterious {@link NoSuchMethodError} at
      * runtime.

library/main/src/com/android/setupwizardlib/items/ReflectionInflater.java

@@ -17,11 +17,12 @@
 package com.android.setupwizardlib.items;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.InflateException;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
 

library/main/src/com/android/setupwizardlib/items/SimpleInflater.java

@@ -18,12 +18,13 @@ package com.android.setupwizardlib.items;
 
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Xml;
 import android.view.InflateException;
 
+import androidx.annotation.NonNull;
+
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 

library/main/src/com/android/setupwizardlib/span/LinkSpan.java

@@ -20,7 +20,6 @@ import android.content.Context;
 import android.content.ContextWrapper;
 import android.graphics.Typeface;
 import android.os.Build;
-import android.support.annotation.Nullable;
 import android.text.Selection;
 import android.text.Spannable;
 import android.text.TextPaint;
@@ -29,6 +28,8 @@ import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+
 /**
  * A clickable span that will listen for click events and send it back to the context. To use this
  * class, implement {@link OnLinkClickListener} in your TextView, or use

library/main/src/com/android/setupwizardlib/template/ButtonFooterMixin.java

@@ -18,10 +18,6 @@ package com.android.setupwizardlib.template;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.annotation.StyleRes;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -30,6 +26,11 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.annotation.StyleRes;
+
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.TemplateLayout;
 

library/main/src/com/android/setupwizardlib/template/HeaderMixin.java

@@ -17,12 +17,13 @@
 package com.android.setupwizardlib.template;
 
 import android.content.res.TypedArray;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.TemplateLayout;
 

library/main/src/com/android/setupwizardlib/template/IconMixin.java

@@ -19,11 +19,12 @@ package com.android.setupwizardlib.template;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
 
+import androidx.annotation.DrawableRes;
+
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.TemplateLayout;
 

library/main/src/com/android/setupwizardlib/template/ListMixin.java

@@ -21,15 +21,16 @@ import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.HeaderViewListAdapter;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.TemplateLayout;
 import com.android.setupwizardlib.items.ItemAdapter;

library/main/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegate.java

@@ -16,13 +16,14 @@
 
 package com.android.setupwizardlib.template;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.widget.AbsListView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.android.setupwizardlib.template.RequireScrollMixin.ScrollHandlingDelegate;
 
 /**

library/main/src/com/android/setupwizardlib/template/ProgressBarMixin.java

@@ -19,11 +19,12 @@ package com.android.setupwizardlib.template;
 import android.content.res.ColorStateList;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.Nullable;
 import android.view.View;
 import android.view.ViewStub;
 import android.widget.ProgressBar;
 
+import androidx.annotation.Nullable;
+
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.TemplateLayout;
 

library/main/src/com/android/setupwizardlib/template/RequireScrollMixin.java

@@ -18,13 +18,14 @@ package com.android.setupwizardlib.template;
 
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+
 import com.android.setupwizardlib.TemplateLayout;
 import com.android.setupwizardlib.view.NavigationBar;
 

library/main/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegate.java

@@ -16,11 +16,12 @@
 
 package com.android.setupwizardlib.template;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.widget.ScrollView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.android.setupwizardlib.template.RequireScrollMixin.ScrollHandlingDelegate;
 import com.android.setupwizardlib.view.BottomScrollView;
 import com.android.setupwizardlib.view.BottomScrollView.BottomScrollListener;

library/main/src/com/android/setupwizardlib/util/FallbackThemeWrapper.java

@@ -18,9 +18,10 @@ package com.android.setupwizardlib.util;
 
 import android.content.Context;
 import android.content.res.Resources.Theme;
-import android.support.annotation.StyleRes;
 import android.view.ContextThemeWrapper;
 
+import androidx.annotation.StyleRes;
+
 /**
  * Same as {@link ContextThemeWrapper}, but the base context's theme attributes take precedence
  * over the wrapper context's. This is used to provide default values for theme attributes

library/main/src/com/android/setupwizardlib/util/Partner.java

@@ -26,13 +26,14 @@ import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.AnyRes;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
-import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 
+import androidx.annotation.AnyRes;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+import androidx.annotation.VisibleForTesting;
+
 import java.util.List;
 
 /**

library/main/src/com/android/setupwizardlib/util/SystemBarHelper.java

@@ -24,7 +24,6 @@ import android.content.res.TypedArray;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Handler;
-import android.support.annotation.RequiresPermission;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -32,6 +31,8 @@ import android.view.Window;
 import android.view.WindowInsets;
 import android.view.WindowManager;
 
+import androidx.annotation.RequiresPermission;
+
 /**
  * A helper class to manage the system navigation bar and status bar. This will add various
  * systemUiVisibility flags to the given Window or View to make them follow the Setup Wizard style.

library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java

@@ -22,8 +22,9 @@ import android.content.res.Resources.Theme;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.provider.Settings;
-import android.support.annotation.StyleRes;
-import android.support.annotation.VisibleForTesting;
+
+import androidx.annotation.StyleRes;
+import androidx.annotation.VisibleForTesting;
 
 import com.android.setupwizardlib.R;
 

library/main/src/com/android/setupwizardlib/view/BottomScrollView.java

@@ -17,11 +17,12 @@
 package com.android.setupwizardlib.view;
 
 import android.content.Context;
-import android.support.annotation.VisibleForTesting;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ScrollView;
 
+import androidx.annotation.VisibleForTesting;
+
 /**
  * An extension of ScrollView that will invoke a listener callback when the ScrollView needs
  * scrolling, and when the ScrollView is being scrolled to the bottom. This is often used in Setup

library/main/src/com/android/setupwizardlib/view/CheckableLinearLayout.java

@@ -19,11 +19,12 @@ package com.android.setupwizardlib.view;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.Checkable;
 import android.widget.LinearLayout;
 
+import androidx.annotation.Nullable;
+
 /**
  * A LinearLayout which is checkable. This will set the checked state when
  * {@link #onCreateDrawableState(int)} is called, and can be used with

library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java

@@ -23,15 +23,16 @@ import android.graphics.SurfaceTexture;
 import android.graphics.drawable.Animatable;
 import android.media.MediaPlayer;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.Nullable;
-import android.support.annotation.RawRes;
-import android.support.annotation.VisibleForTesting;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.Surface;
 import android.view.TextureView;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.RawRes;
+import androidx.annotation.VisibleForTesting;
+
 import com.android.setupwizardlib.R;
 
 /**

library/main/src/com/android/setupwizardlib/view/NavigationBar.java

@@ -21,13 +21,14 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.StyleableRes;
 import android.util.AttributeSet;
 import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
 
+import androidx.annotation.StyleableRes;
+
 import com.android.setupwizardlib.R;
 
 /**

library/recyclerview/res/layout/suw_preference_recycler_view_normal.xml

@@ -15,7 +15,7 @@
     limitations under the License.
 -->
 
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/suw_recycler_view"
     android:layout_width="match_parent"

library/recyclerview/res/layout/suw_recycler_template_card.xml

@@ -49,7 +49,7 @@
                 android:elevation="@dimen/suw_card_elevation"
                 tools:ignore="UnusedAttribute">
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/suw_recycler_view"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"

library/recyclerview/res/layout/suw_recycler_template_card_wide.xml

@@ -50,7 +50,7 @@
                 android:elevation="@dimen/suw_card_elevation"
                 tools:ignore="UnusedAttribute">
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/suw_recycler_view"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"

library/recyclerview/res/layout/suw_recycler_template_header_collapsed.xml

@@ -44,7 +44,7 @@
         android:layout_height="0dp"
         android:layout_weight="1">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/suw_recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

library/recyclerview/src/com/android/setupwizardlib/DividerItemDecoration.java

@@ -21,16 +21,17 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.IntDef;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import androidx.annotation.IntDef;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 /**
- * An {@link android.support.v7.widget.RecyclerView.ItemDecoration} for RecyclerView to draw
+ * An {@link androidx.recyclerview.widget.RecyclerView.ItemDecoration} for RecyclerView to draw
  * dividers between items. This ItemDecoration will draw the drawable specified by
  * {@link #setDivider(android.graphics.drawable.Drawable)} as the divider in between each item by
  * default, and the behavior of whether the divider is shown can be customized by subclassing

library/recyclerview/src/com/android/setupwizardlib/GlifPreferenceLayout.java

@@ -18,12 +18,13 @@ package com.android.setupwizardlib;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.setupwizardlib.template.RecyclerMixin;
 
 /**

library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java

@@ -20,14 +20,15 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Build.VERSION_CODES;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.Adapter;
-import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
 import com.android.setupwizardlib.template.RecyclerMixin;
 import com.android.setupwizardlib.template.RecyclerViewScrollHandlingDelegate;
 import com.android.setupwizardlib.template.RequireScrollMixin;

library/recyclerview/src/com/android/setupwizardlib/SetupWizardPreferenceLayout.java

@@ -18,12 +18,13 @@ package com.android.setupwizardlib;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.setupwizardlib.template.RecyclerMixin;
 
 /**

library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java

@@ -18,20 +18,21 @@ package com.android.setupwizardlib;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.Adapter;
-import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
 import com.android.setupwizardlib.template.RecyclerMixin;
 import com.android.setupwizardlib.template.RecyclerViewScrollHandlingDelegate;
 import com.android.setupwizardlib.template.RequireScrollMixin;
 
 /**
- * A setup wizard layout for use with {@link android.support.v7.widget.RecyclerView}.
+ * A setup wizard layout for use with {@link androidx.recyclerview.widget.RecyclerView}.
  * {@code android:entries} can also be used to specify an
  * {@link com.android.setupwizardlib.items.ItemHierarchy} to be used with this layout in XML.
  *

library/recyclerview/src/com/android/setupwizardlib/items/ItemViewHolder.java

@@ -16,9 +16,10 @@
 
 package com.android.setupwizardlib.items;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.setupwizardlib.DividerItemDecoration;
 
 class ItemViewHolder extends RecyclerView.ViewHolder

library/recyclerview/src/com/android/setupwizardlib/items/RecyclerItemAdapter.java

@@ -20,13 +20,14 @@ import android.content.res.TypedArray;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.setupwizardlib.R;
 
 /**

library/recyclerview/src/com/android/setupwizardlib/template/RecyclerMixin.java

@@ -21,15 +21,16 @@ import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.Adapter;
-import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
 import com.android.setupwizardlib.DividerItemDecoration;
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.TemplateLayout;

library/recyclerview/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegate.java

@@ -16,11 +16,12 @@
 
 package com.android.setupwizardlib.template;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.setupwizardlib.template.RequireScrollMixin.ScrollHandlingDelegate;
 
 /**

library/recyclerview/src/com/android/setupwizardlib/view/HeaderRecyclerView.java

@@ -19,7 +19,6 @@ package com.android.setupwizardlib.view;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build;
-import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -27,6 +26,8 @@ import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.FrameLayout;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.setupwizardlib.DividerItemDecoration;
 import com.android.setupwizardlib.R;
 

library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/items/RecyclerItemAdapterTest.java

@@ -35,9 +35,10 @@ import android.graphics.drawable.shapes.RectShape;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
-import android.support.v7.widget.RecyclerView.AdapterDataObserver;
 import android.widget.FrameLayout;
 
+import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
+
 import com.android.setupwizardlib.items.RecyclerItemAdapter.PatchedLayerDrawable;
 import com.android.setupwizardlib.test.R;
 

library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/template/RecyclerMixinTest.java

@@ -33,10 +33,11 @@ import android.os.Build.VERSION_CODES;
 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.support.v7.widget.RecyclerView.Adapter;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
+
 import com.android.setupwizardlib.TemplateLayout;
 import com.android.setupwizardlib.test.R;
 

library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/DividerItemDecorationTest.java

@@ -31,11 +31,12 @@ import android.graphics.drawable.Drawable;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.setupwizardlib.DividerItemDecoration;
 
 import org.junit.Test;

library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/GlifPreferenceLayoutTest.java

@@ -27,12 +27,13 @@ import android.os.Build;
 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.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.setupwizardlib.GlifPreferenceLayout;
 
 import org.junit.Before;

library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/GlifRecyclerLayoutTest.java

@@ -29,14 +29,15 @@ import android.os.Build;
 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.support.v7.widget.RecyclerView.Adapter;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.MeasureSpec;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
+
 import com.android.setupwizardlib.GlifRecyclerLayout;
 
 import org.junit.Before;

library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/HeaderRecyclerViewTest.java

@@ -22,10 +22,11 @@ import static org.mockito.Mockito.verify;
 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.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.setupwizardlib.view.HeaderRecyclerView.HeaderAdapter;
 
 import org.junit.Before;

library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardPreferenceLayoutTest.java

@@ -27,12 +27,13 @@ import android.os.Build;
 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.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.setupwizardlib.SetupWizardPreferenceLayout;
 
 import org.junit.Before;

library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardRecyclerLayoutTest.java

@@ -29,15 +29,16 @@ import android.os.Build;
 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.support.v7.widget.RecyclerView.Adapter;
-import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.MeasureSpec;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
 import com.android.setupwizardlib.SetupWizardRecyclerLayout;
 
 import org.junit.Before;

library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java

@@ -24,8 +24,8 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.robolectric.RuntimeEnvironment.application;
 
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.OnScrollListener;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
 
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 

library/standalone-rules.gradle

@@ -26,9 +26,9 @@ ext {
     //      }
     //
     deps = [
-        'support-annotations': 'com.android.support:support-annotations:23.4.0',
-        'support-appcompat-v7': 'com.android.support:appcompat-v7:23.4.0',
-        'support-recyclerview-v7': 'com.android.support:recyclerview-v7:23.4.0'
+        'support-annotations': 'androidx.annotation:annotation:1.0.0-alpha1',
+        'support-appcompat-v7': 'androidx.appcompat:appcompat:1.0.0-alpha1',
+        'support-recyclerview-v7': 'androidx.recyclerview:recyclerview:1.0.0-alpha1'
     ]
 }
 

library/test/instrumentation/src/com/android/setupwizardlib/template/ButtonFooterMixinTest.java

@@ -24,7 +24,6 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 
 import android.content.Context;
-import android.support.annotation.IdRes;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
@@ -36,6 +35,8 @@ import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
+import androidx.annotation.IdRes;
+
 import com.android.setupwizardlib.TemplateLayout;
 import com.android.setupwizardlib.test.R;
 

library/test/instrumentation/src/com/android/setupwizardlib/test/ReflectionInflaterTest.java

@@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
@@ -28,6 +27,8 @@ import android.view.animation.Animation;
 import android.view.animation.AnimationSet;
 import android.view.animation.ScaleAnimation;
 
+import androidx.annotation.NonNull;
+
 import com.android.setupwizardlib.items.ReflectionInflater;
 
 import org.junit.Test;

library/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardLayoutTest.java

@@ -27,7 +27,6 @@ import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Parcelable;
-import android.support.annotation.IdRes;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
@@ -39,6 +38,8 @@ import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.IdRes;
+
 import com.android.setupwizardlib.SetupWizardLayout;
 import com.android.setupwizardlib.template.HeaderMixin;
 import com.android.setupwizardlib.template.NavigationBarMixin;

library/test/instrumentation/src/com/android/setupwizardlib/test/SimpleInflaterTest.java

@@ -20,12 +20,13 @@ import static org.junit.Assert.assertEquals;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.support.annotation.NonNull;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 
+import androidx.annotation.NonNull;
+
 import com.android.setupwizardlib.items.SimpleInflater;
 
 import org.junit.Test;

library/test/instrumentation/src/com/android/setupwizardlib/test/util/DrawingTestHelper.java

@@ -24,11 +24,12 @@ import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.support.annotation.StyleRes;
 import android.support.test.InstrumentationRegistry;
 import android.view.View;
 import android.view.View.MeasureSpec;
 
+import androidx.annotation.StyleRes;
+
 public class DrawingTestHelper {
 
     /**

library/test/instrumentation/src/com/android/setupwizardlib/test/util/MockWindow.java

@@ -21,7 +21,6 @@ import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.view.InputQueue;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -31,6 +30,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 
+import androidx.annotation.NonNull;
+
 public class MockWindow extends Window {
 
     public MockWindow(Context context) {

library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java

@@ -34,13 +34,14 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.IdRes;
 import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
+import androidx.annotation.IdRes;
+
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.template.ColoredHeaderMixin;
 import com.android.setupwizardlib.template.HeaderMixin;

library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java

@@ -28,11 +28,12 @@ import android.content.Context;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.ContextThemeWrapper;
 import android.widget.Button;
 import android.widget.ProgressBar;
 
+import androidx.annotation.Nullable;
+
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 

library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java

@@ -27,10 +27,11 @@ import android.graphics.Typeface;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.Button;
 
+import androidx.annotation.Nullable;
+
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 

library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java

@@ -29,7 +29,8 @@ import android.os.Bundle;
 import android.provider.Settings;
 import android.provider.Settings.Global;
 import android.provider.Settings.Secure;
-import android.support.annotation.StyleRes;
+
+import androidx.annotation.StyleRes;
 
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;

library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java

@@ -29,9 +29,10 @@ import android.content.Context;
 import android.graphics.SurfaceTexture;
 import android.media.MediaPlayer;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.RawRes;
 import android.view.Surface;
 
+import androidx.annotation.RawRes;
+
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
 import com.android.setupwizardlib.shadow.ShadowLog;

tools/gradle/repositories.properties

@@ -1,3 +1,4 @@
 repositories {
     maven { url "$rootDir/prebuilts/maven_repo/robolectric" }
+    maven { url "$rootDir/prebuilts/maven_repo/android" }
 }