diff options
78 files changed, 249 insertions, 249 deletions
diff --git a/library/Android.bp b/library/Android.bp new file mode 100644 index 0000000..61cd83a --- /dev/null +++ b/library/Android.bp @@ -0,0 +1,51 @@ +// +// Build the platform version of setup wizard library. +// + +android_library { + name: "setup-wizard-lib", + + libs: ["androidx.annotation_annotation"], + manifest: "main/AndroidManifest.xml", + resource_dirs: [ + "main/res", + "platform/res", + ], + sdk_version: "current", + srcs: [ + "main/src/**/*.java", + "platform/src/**/*.java", + ], + min_sdk_version: "23", +} + +// +// Build gingerbread-compat library, which uses AppCompat support library to provide backwards +// compatibility back to SDK v9. +// + +android_library { + name: "setup-wizard-lib-gingerbread-compat", + manifest: "main/AndroidManifest.xml", + resource_dirs: [ + "main/res", + "gingerbread/res", + "recyclerview/res", + ], + sdk_version: "current", + srcs: [ + "main/src/**/*.java", + "gingerbread/src/**/*.java", + "recyclerview/src/**/*.java", + ], + + libs: [ + "androidx.annotation_annotation", + "androidx.core_core", + "androidx.legacy_legacy-support-core-ui", + "androidx.appcompat_appcompat", + "androidx.recyclerview_recyclerview", + ], + + min_sdk_version: "14", +} diff --git a/library/Android.mk b/library/Android.mk deleted file mode 100644 index ff92194..0000000 --- a/library/Android.mk +++ /dev/null @@ -1,51 +0,0 @@ -## -# Build the platform version of setup wizard library. -# - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_USE_AAPT2 := true -LOCAL_JAVA_LIBRARIES := \ - android-support-annotations -LOCAL_MANIFEST_FILE := main/AndroidManifest.xml -LOCAL_MODULE := setup-wizard-lib -LOCAL_RESOURCE_DIR := \ - $(LOCAL_PATH)/main/res \ - $(LOCAL_PATH)/platform/res -LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := $(call all-java-files-under, main/src platform/src) - -include $(BUILD_STATIC_JAVA_LIBRARY) - - -## -# Build gingerbread-compat library, which uses AppCompat support library to provide backwards -# compatibility back to SDK v9. -# - -include $(CLEAR_VARS) - -LOCAL_USE_AAPT2 := true - -LOCAL_AAPT2_ONLY := true - -LOCAL_MANIFEST_FILE := main/AndroidManifest.xml -LOCAL_MODULE := setup-wizard-lib-gingerbread-compat -LOCAL_RESOURCE_DIR := \ - $(LOCAL_PATH)/main/res \ - $(LOCAL_PATH)/gingerbread/res \ - $(LOCAL_PATH)/recyclerview/res -LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := $(call all-java-files-under, main/src gingerbread/src recyclerview/src) - -LOCAL_JAVA_LIBRARIES := \ - android-support-annotations - -LOCAL_SHARED_ANDROID_LIBRARIES := \ - android-support-compat \ - android-support-core-ui \ - android-support-v7-appcompat \ - android-support-v7-recyclerview - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/library/common-gingerbread.mk b/library/common-gingerbread.mk index 70231df..2ab06b6 100644 --- a/library/common-gingerbread.mk +++ b/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 diff --git a/library/gingerbread/res/layout/suw_items_expandable_switch.xml b/library/gingerbread/res/layout/suw_items_expandable_switch.xml index 21c2c22..f134b3f 100644 --- a/library/gingerbread/res/layout/suw_items_expandable_switch.xml +++ b/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" diff --git a/library/gingerbread/res/layout/suw_items_switch.xml b/library/gingerbread/res/layout/suw_items_switch.xml index 319d7f7..5296a62 100644 --- a/library/gingerbread/res/layout/suw_items_switch.xml +++ b/library/gingerbread/res/layout/suw_items_switch.xml @@ -67,7 +67,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" diff --git a/library/gingerbread/src/com/android/setupwizardlib/items/SwitchItem.java b/library/gingerbread/src/com/android/setupwizardlib/items/SwitchItem.java index 7459d77..8d828ac 100644 --- a/library/gingerbread/src/com/android/setupwizardlib/items/SwitchItem.java +++ b/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; /** diff --git a/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java b/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java index 9965aa0..2a378e8 100644 --- a/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java +++ b/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 { diff --git a/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java b/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java index d7a3c2e..872cc9f 100644 --- a/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java +++ b/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. diff --git a/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java b/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java index 1b1f82e..1ee3219 100644 --- a/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java +++ b/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; diff --git a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java index b97905c..f5b8253 100644 --- a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java +++ b/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; diff --git a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/test/util/DrawingTestActivity.java b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/test/util/DrawingTestActivity.java index 154339a..d3518f4 100644 --- a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/test/util/DrawingTestActivity.java +++ b/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 diff --git a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/util/LinkAccessibilityHelperTest.java b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/util/LinkAccessibilityHelperTest.java index 6228e6f..7b4ad4d 100644 --- a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/util/LinkAccessibilityHelperTest.java +++ b/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; diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java index dd26af9..05d6e5b 100644 --- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java +++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java @@ -26,7 +26,6 @@ import static org.robolectric.RuntimeEnvironment.application; import android.annotation.TargetApi; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import android.support.v7.widget.SwitchCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -34,6 +33,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; diff --git a/library/main/res/values-as/strings.xml b/library/main/res/values-as/strings.xml deleted file mode 100644 index be6e06b..0000000 --- a/library/main/res/values-as/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (C) 2015 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="suw_next_button_label" msgid="7269625133873553978">"পৰৱৰ্তী"</string> - <string name="suw_back_button_label" msgid="1460929053642711025">"উভতি যাওক"</string> - <string name="suw_more_button_label" msgid="7769076059705546563">"অধিক"</string> -</resources> diff --git a/library/main/res/values-or/strings.xml b/library/main/res/values-or/strings.xml deleted file mode 100644 index c4d12ff..0000000 --- a/library/main/res/values-or/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (C) 2015 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="suw_next_button_label" msgid="7269625133873553978">"ପରବର୍ତ୍ତୀ"</string> - <string name="suw_back_button_label" msgid="1460929053642711025">"ପଛକୁ ଫେରନ୍ତୁ"</string> - <string name="suw_more_button_label" msgid="7769076059705546563">"ଅଧିକ"</string> -</resources> diff --git a/library/main/src/com/android/setupwizardlib/GlifLayout.java b/library/main/src/com/android/setupwizardlib/GlifLayout.java index e1d9d70..9b30c2f 100644 --- a/library/main/src/com/android/setupwizardlib/GlifLayout.java +++ b/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; diff --git a/library/main/src/com/android/setupwizardlib/GlifPatternDrawable.java b/library/main/src/com/android/setupwizardlib/GlifPatternDrawable.java index c1d968a..caf92ac 100644 --- a/library/main/src/com/android/setupwizardlib/GlifPatternDrawable.java +++ b/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; diff --git a/library/main/src/com/android/setupwizardlib/SetupWizardItemsLayout.java b/library/main/src/com/android/setupwizardlib/SetupWizardItemsLayout.java index 5a39d70..d520873 100644 --- a/library/main/src/com/android/setupwizardlib/SetupWizardItemsLayout.java +++ b/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; /** diff --git a/library/main/src/com/android/setupwizardlib/TemplateLayout.java b/library/main/src/com/android/setupwizardlib/TemplateLayout.java index d270091..0108880 100644 --- a/library/main/src/com/android/setupwizardlib/TemplateLayout.java +++ b/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. diff --git a/library/main/src/com/android/setupwizardlib/items/ReflectionInflater.java b/library/main/src/com/android/setupwizardlib/items/ReflectionInflater.java index c7af410..8ffa943 100644 --- a/library/main/src/com/android/setupwizardlib/items/ReflectionInflater.java +++ b/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; diff --git a/library/main/src/com/android/setupwizardlib/items/SimpleInflater.java b/library/main/src/com/android/setupwizardlib/items/SimpleInflater.java index 141438b..0b12aca 100644 --- a/library/main/src/com/android/setupwizardlib/items/SimpleInflater.java +++ b/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; diff --git a/library/main/src/com/android/setupwizardlib/span/LinkSpan.java b/library/main/src/com/android/setupwizardlib/span/LinkSpan.java index 26a3d16..3dd783b 100644 --- a/library/main/src/com/android/setupwizardlib/span/LinkSpan.java +++ b/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 diff --git a/library/main/src/com/android/setupwizardlib/template/ButtonFooterMixin.java b/library/main/src/com/android/setupwizardlib/template/ButtonFooterMixin.java index 01dbc29..a8580a3 100644 --- a/library/main/src/com/android/setupwizardlib/template/ButtonFooterMixin.java +++ b/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; diff --git a/library/main/src/com/android/setupwizardlib/template/HeaderMixin.java b/library/main/src/com/android/setupwizardlib/template/HeaderMixin.java index bd3f210..604de9a 100644 --- a/library/main/src/com/android/setupwizardlib/template/HeaderMixin.java +++ b/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; diff --git a/library/main/src/com/android/setupwizardlib/template/IconMixin.java b/library/main/src/com/android/setupwizardlib/template/IconMixin.java index 5386c92..5f5c915 100644 --- a/library/main/src/com/android/setupwizardlib/template/IconMixin.java +++ b/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; diff --git a/library/main/src/com/android/setupwizardlib/template/ListMixin.java b/library/main/src/com/android/setupwizardlib/template/ListMixin.java index 10e85a9..cbc29b5 100644 --- a/library/main/src/com/android/setupwizardlib/template/ListMixin.java +++ b/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; diff --git a/library/main/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegate.java b/library/main/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegate.java index f55d06d..faea305 100644 --- a/library/main/src/com/android/setupwizardlib/template/ListViewScrollHandlingDelegate.java +++ b/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; /** diff --git a/library/main/src/com/android/setupwizardlib/template/ProgressBarMixin.java b/library/main/src/com/android/setupwizardlib/template/ProgressBarMixin.java index eecf99c..504b2f0 100644 --- a/library/main/src/com/android/setupwizardlib/template/ProgressBarMixin.java +++ b/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; diff --git a/library/main/src/com/android/setupwizardlib/template/RequireScrollMixin.java b/library/main/src/com/android/setupwizardlib/template/RequireScrollMixin.java index 231c064..fd3303b 100644 --- a/library/main/src/com/android/setupwizardlib/template/RequireScrollMixin.java +++ b/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; diff --git a/library/main/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegate.java b/library/main/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegate.java index d159465..9e4d1cf 100644 --- a/library/main/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegate.java +++ b/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; diff --git a/library/main/src/com/android/setupwizardlib/util/FallbackThemeWrapper.java b/library/main/src/com/android/setupwizardlib/util/FallbackThemeWrapper.java index 975927b..2ec4f84 100644 --- a/library/main/src/com/android/setupwizardlib/util/FallbackThemeWrapper.java +++ b/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 diff --git a/library/main/src/com/android/setupwizardlib/util/Partner.java b/library/main/src/com/android/setupwizardlib/util/Partner.java index baf66d1..9eaedc3 100644 --- a/library/main/src/com/android/setupwizardlib/util/Partner.java +++ b/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; /** diff --git a/library/main/src/com/android/setupwizardlib/util/SystemBarHelper.java b/library/main/src/com/android/setupwizardlib/util/SystemBarHelper.java index b31e82e..7e3e885 100644 --- a/library/main/src/com/android/setupwizardlib/util/SystemBarHelper.java +++ b/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. diff --git a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java index cf9ddac..0628192 100644 --- a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java +++ b/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; diff --git a/library/main/src/com/android/setupwizardlib/view/BottomScrollView.java b/library/main/src/com/android/setupwizardlib/view/BottomScrollView.java index aac6668..eeb40a9 100644 --- a/library/main/src/com/android/setupwizardlib/view/BottomScrollView.java +++ b/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 diff --git a/library/main/src/com/android/setupwizardlib/view/CheckableLinearLayout.java b/library/main/src/com/android/setupwizardlib/view/CheckableLinearLayout.java index bd0aead..9605f99 100644 --- a/library/main/src/com/android/setupwizardlib/view/CheckableLinearLayout.java +++ b/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 diff --git a/library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java b/library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java index e5c2fb1..6d31583 100644 --- a/library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java +++ b/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; /** diff --git a/library/main/src/com/android/setupwizardlib/view/NavigationBar.java b/library/main/src/com/android/setupwizardlib/view/NavigationBar.java index 2a1dd28..9971bac 100644 --- a/library/main/src/com/android/setupwizardlib/view/NavigationBar.java +++ b/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; /** diff --git a/library/recyclerview/res/layout/suw_preference_recycler_view_normal.xml b/library/recyclerview/res/layout/suw_preference_recycler_view_normal.xml index 0979d91..088a35c 100644 --- a/library/recyclerview/res/layout/suw_preference_recycler_view_normal.xml +++ b/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" diff --git a/library/recyclerview/res/layout/suw_recycler_template_card.xml b/library/recyclerview/res/layout/suw_recycler_template_card.xml index 1d7b143..79cbcd6 100644 --- a/library/recyclerview/res/layout/suw_recycler_template_card.xml +++ b/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" diff --git a/library/recyclerview/res/layout/suw_recycler_template_card_wide.xml b/library/recyclerview/res/layout/suw_recycler_template_card_wide.xml index e5e876f..31f1ca0 100644 --- a/library/recyclerview/res/layout/suw_recycler_template_card_wide.xml +++ b/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" diff --git a/library/recyclerview/res/layout/suw_recycler_template_header_collapsed.xml b/library/recyclerview/res/layout/suw_recycler_template_header_collapsed.xml index 1960f0d..833f7d0 100644 --- a/library/recyclerview/res/layout/suw_recycler_template_header_collapsed.xml +++ b/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" diff --git a/library/recyclerview/src/com/android/setupwizardlib/DividerItemDecoration.java b/library/recyclerview/src/com/android/setupwizardlib/DividerItemDecoration.java index 6c1a928..2db17f8 100644 --- a/library/recyclerview/src/com/android/setupwizardlib/DividerItemDecoration.java +++ b/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 diff --git a/library/recyclerview/src/com/android/setupwizardlib/GlifPreferenceLayout.java b/library/recyclerview/src/com/android/setupwizardlib/GlifPreferenceLayout.java index d337e84..af1a739 100644 --- a/library/recyclerview/src/com/android/setupwizardlib/GlifPreferenceLayout.java +++ b/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; /** diff --git a/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java b/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java index e8a021d..7e0b1b7 100644 --- a/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java +++ b/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; diff --git a/library/recyclerview/src/com/android/setupwizardlib/SetupWizardPreferenceLayout.java b/library/recyclerview/src/com/android/setupwizardlib/SetupWizardPreferenceLayout.java index 6570694..670c309 100644 --- a/library/recyclerview/src/com/android/setupwizardlib/SetupWizardPreferenceLayout.java +++ b/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; /** diff --git a/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java b/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java index 6f3aed4..5d3f1a5 100644 --- a/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java +++ b/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. * diff --git a/library/recyclerview/src/com/android/setupwizardlib/items/ItemViewHolder.java b/library/recyclerview/src/com/android/setupwizardlib/items/ItemViewHolder.java index 231f81d..aeaba68 100644 --- a/library/recyclerview/src/com/android/setupwizardlib/items/ItemViewHolder.java +++ b/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 diff --git a/library/recyclerview/src/com/android/setupwizardlib/items/RecyclerItemAdapter.java b/library/recyclerview/src/com/android/setupwizardlib/items/RecyclerItemAdapter.java index 0703c17..56c60e7 100644 --- a/library/recyclerview/src/com/android/setupwizardlib/items/RecyclerItemAdapter.java +++ b/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; /** diff --git a/library/recyclerview/src/com/android/setupwizardlib/template/RecyclerMixin.java b/library/recyclerview/src/com/android/setupwizardlib/template/RecyclerMixin.java index fa5ac4a..32e7bd8 100644 --- a/library/recyclerview/src/com/android/setupwizardlib/template/RecyclerMixin.java +++ b/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; diff --git a/library/recyclerview/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegate.java b/library/recyclerview/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegate.java index 41fb03e..bfe8df2 100644 --- a/library/recyclerview/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegate.java +++ b/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; /** diff --git a/library/recyclerview/src/com/android/setupwizardlib/view/HeaderRecyclerView.java b/library/recyclerview/src/com/android/setupwizardlib/view/HeaderRecyclerView.java index cf13d01..0304b65 100644 --- a/library/recyclerview/src/com/android/setupwizardlib/view/HeaderRecyclerView.java +++ b/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; diff --git a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/items/RecyclerItemAdapterTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/items/RecyclerItemAdapterTest.java index 1bfbb95..6f42e84 100644 --- a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/items/RecyclerItemAdapterTest.java +++ b/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; diff --git a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/template/RecyclerMixinTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/template/RecyclerMixinTest.java index ce73791..ece4bf9 100644 --- a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/template/RecyclerMixinTest.java +++ b/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; diff --git a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/DividerItemDecorationTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/DividerItemDecorationTest.java index 747d1ba..9cf33b9 100644 --- a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/DividerItemDecorationTest.java +++ b/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; diff --git a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/GlifPreferenceLayoutTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/GlifPreferenceLayoutTest.java index 791e11f..4d2876d 100644 --- a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/GlifPreferenceLayoutTest.java +++ b/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; diff --git a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/GlifRecyclerLayoutTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/GlifRecyclerLayoutTest.java index 4bd98ce..a68faf0 100644 --- a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/GlifRecyclerLayoutTest.java +++ b/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; diff --git a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/HeaderRecyclerViewTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/HeaderRecyclerViewTest.java index d9f52cd..9af68a7 100644 --- a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/HeaderRecyclerViewTest.java +++ b/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; diff --git a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardPreferenceLayoutTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardPreferenceLayoutTest.java index 486d2cf..316793f 100644 --- a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardPreferenceLayoutTest.java +++ b/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; diff --git a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardRecyclerLayoutTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardRecyclerLayoutTest.java index 4b38945..bbe773b 100644 --- a/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardRecyclerLayoutTest.java +++ b/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; diff --git a/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java b/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java index 5912f7f..6fa4c54 100644 --- a/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java +++ b/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; diff --git a/library/standalone-rules.gradle b/library/standalone-rules.gradle index 7f505a1..e17cffd 100644 --- a/library/standalone-rules.gradle +++ b/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' ] } diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/template/ButtonFooterMixinTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/template/ButtonFooterMixinTest.java index 2772cb1..08f5958 100644 --- a/library/test/instrumentation/src/com/android/setupwizardlib/template/ButtonFooterMixinTest.java +++ b/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; diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/test/ReflectionInflaterTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/ReflectionInflaterTest.java index 5c22324..137a146 100644 --- a/library/test/instrumentation/src/com/android/setupwizardlib/test/ReflectionInflaterTest.java +++ b/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; diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardLayoutTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardLayoutTest.java index aab2efb..531d69e 100644 --- a/library/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardLayoutTest.java +++ b/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; diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/test/SimpleInflaterTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/SimpleInflaterTest.java index bd4c251..f4738ca 100644 --- a/library/test/instrumentation/src/com/android/setupwizardlib/test/SimpleInflaterTest.java +++ b/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; diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/test/util/DrawingTestHelper.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/util/DrawingTestHelper.java index 94ef145..6910513 100644 --- a/library/test/instrumentation/src/com/android/setupwizardlib/test/util/DrawingTestHelper.java +++ b/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 { /** diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/test/util/MockWindow.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/util/MockWindow.java index 9358aad..7af20eb 100644 --- a/library/test/instrumentation/src/com/android/setupwizardlib/test/util/MockWindow.java +++ b/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) { diff --git a/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java b/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java index d2d1ee0..2a4a8c0 100644 --- a/library/test/robotest/src/com/android/setupwizardlib/GlifLayoutTest.java +++ b/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; diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java index 46df9d6..d8e318d 100644 --- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java +++ b/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; diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java index 613f2aa..44b8886 100644 --- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java +++ b/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; diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java index 0d15ef4..616ccdd 100644 --- a/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java +++ b/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; diff --git a/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java b/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java index 21822a4..1be822d 100644 --- a/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java +++ b/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; diff --git a/navigationbar/Android.bp b/navigationbar/Android.bp new file mode 100644 index 0000000..3868fe1 --- /dev/null +++ b/navigationbar/Android.bp @@ -0,0 +1,7 @@ +android_library { + name: "setup-wizard-navbar", + + sdk_version: "current", + resource_dirs: ["res"], + srcs: ["src/**/*.java"], +} diff --git a/navigationbar/Android.mk b/navigationbar/Android.mk deleted file mode 100644 index 5036990..0000000 --- a/navigationbar/Android.mk +++ /dev/null @@ -1,9 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SDK_VERSION := current -LOCAL_MODULE := setup-wizard-navbar -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/navigationbar/res/values-as/strings.xml b/navigationbar/res/values-as/strings.xml deleted file mode 100644 index 398ff1f..0000000 --- a/navigationbar/res/values-as/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"পৰৱৰ্তী"</string> - <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"উভতি যাওক"</string> -</resources> diff --git a/navigationbar/res/values-or/strings.xml b/navigationbar/res/values-or/strings.xml deleted file mode 100644 index 4c70d06..0000000 --- a/navigationbar/res/values-or/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"ପରବର୍ତ୍ତୀ"</string> - <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"ପଛକୁ ଫେରନ୍ତୁ"</string> -</resources> diff --git a/tools/gradle/repositories.properties b/tools/gradle/repositories.properties index 378d454..d2c15a1 100644 --- a/tools/gradle/repositories.properties +++ b/tools/gradle/repositories.properties @@ -1,3 +1,4 @@ repositories { maven { url "$rootDir/prebuilts/maven_repo/robolectric" } + maven { url "$rootDir/prebuilts/maven_repo/android" } } |