Migrate TvSettings to androidx.
Bug: 76692459
Test: make TvSettings
Change-Id: I0585feae9218c7a2b066a02a3ecb7a1d92fceb7f
Merged-In: I0585feae9218c7a2b066a02a3ecb7a1d92fceb7f
(cherry picked from commit d0b6112d9bb5798c207e383b6944f8983eddf9df)
(cherry picked from commit 41c370c050bc5b4390b50b2af090fbff49ede93c)
diff --git a/QuickSettings/Android.mk b/QuickSettings/Android.mk
index 9cf09c2..5561039 100644
--- a/QuickSettings/Android.mk
+++ b/QuickSettings/Android.mk
@@ -13,13 +13,13 @@
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-v4 \
- android-support-v7-recyclerview \
- android-support-v7-preference \
- android-support-v7-appcompat \
- android-support-v14-preference \
- android-support-v17-preference-leanback \
- android-support-v17-leanback
+ androidx.legacy_legacy-support-v4 \
+ androidx.recyclerview_recyclerview \
+ androidx.preference_preference \
+ androidx.appcompat_appcompat \
+ androidx.legacy_legacy-preference-v14 \
+ androidx.leanback_leanback-preference \
+ androidx.leanback_leanback
LOCAL_USE_AAPT2 := true
diff --git a/QuickSettings/proguard.cfg b/QuickSettings/proguard.cfg
index 0d59941..d0809e9 100644
--- a/QuickSettings/proguard.cfg
+++ b/QuickSettings/proguard.cfg
@@ -12,10 +12,10 @@
-keep public class * extends android.content.ContentProvider
-keep public class * extends android.app.backup.BackupAgentHelper
-keep public class * extends android.preference.Preference
--keep public class android.support.v7.preference.Preference {
+-keep public class androidx.preference.Preference {
public <init>(android.content.Context, android.util.AttributeSet);
}
--keep public class * extends android.support.v7.preference.Preference {
+-keep public class * extends androidx.preference.Preference {
public <init>(android.content.Context, android.util.AttributeSet);
}
-keep public class com.android.vending.licensing.ILicensingService
@@ -49,7 +49,7 @@
-dontwarn org.bouncycastle.jce.provider.X509LDAPCertStoreSpi
-dontwarn org.bouncycastle.util.io.pem.AllTests
-dontwarn org.bouncycastle.util.AllTests
--dontwarn android.support.v13.app.FragmentCompatICSMR1
--dontwarn android.support.v4.view.ViewCompatJellybeanMr1
+-dontwarn androidx.legacy.app.FragmentCompatICSMR1
+-dontwarn androidx.core.view.ViewCompatJellybeanMr1
-dontwarn org.bouncycastle.x509.X509V3CertificateGenerator
-dontwarn org.bouncycastle.jce.provider.BouncyCastleProvider
diff --git a/QuickSettings/res/layout/main_quicksettings.xml b/QuickSettings/res/layout/main_quicksettings.xml
index 9fc41ea..070b854 100644
--- a/QuickSettings/res/layout/main_quicksettings.xml
+++ b/QuickSettings/res/layout/main_quicksettings.xml
@@ -23,7 +23,7 @@
android:elevation="@dimen/panel_z"
android:orientation="horizontal" >
- <android.support.v17.leanback.widget.VerticalGridView
+ <androidx.leanback.widget.VerticalGridView
android:id="@+id/main_panel_list"
android:layout_width="@dimen/main_panel_text_width"
android:layout_height="@dimen/main_panel_height"
diff --git a/QuickSettings/src/com/android/tv/quicksettings/DialogAdapter.java b/QuickSettings/src/com/android/tv/quicksettings/DialogAdapter.java
index f03d91c..188c41d 100644
--- a/QuickSettings/src/com/android/tv/quicksettings/DialogAdapter.java
+++ b/QuickSettings/src/com/android/tv/quicksettings/DialogAdapter.java
@@ -13,7 +13,7 @@
*/
package com.android.tv.quicksettings;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/QuickSettings/src/com/android/tv/quicksettings/QuickSettings.java b/QuickSettings/src/com/android/tv/quicksettings/QuickSettings.java
index 3210535..e60b51d 100644
--- a/QuickSettings/src/com/android/tv/quicksettings/QuickSettings.java
+++ b/QuickSettings/src/com/android/tv/quicksettings/QuickSettings.java
@@ -16,11 +16,11 @@
import android.app.Activity;
import android.app.Fragment;
import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v17.preference.LeanbackPreferenceFragment;
-import android.support.v17.preference.LeanbackSettingsFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceFragment;
+import androidx.leanback.preference.LeanbackPreferenceFragment;
+import androidx.leanback.preference.LeanbackSettingsFragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
public class QuickSettings extends Activity {
diff --git a/QuickSettings/src/com/android/tv/quicksettings/QuickSettingsPreferenceFragment.java b/QuickSettings/src/com/android/tv/quicksettings/QuickSettingsPreferenceFragment.java
index e98c0b9..af16f9c 100644
--- a/QuickSettings/src/com/android/tv/quicksettings/QuickSettingsPreferenceFragment.java
+++ b/QuickSettings/src/com/android/tv/quicksettings/QuickSettingsPreferenceFragment.java
@@ -22,9 +22,9 @@
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.os.Bundle;
-import android.support.v17.preference.LeanbackPreferenceFragment;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
+import androidx.leanback.preference.LeanbackPreferenceFragment;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
import java.util.Arrays;
import java.util.List;
diff --git a/QuickSettings/src/com/android/tv/quicksettings/SettingsDialog.java b/QuickSettings/src/com/android/tv/quicksettings/SettingsDialog.java
index 5c61def..a2bbeb0 100644
--- a/QuickSettings/src/com/android/tv/quicksettings/SettingsDialog.java
+++ b/QuickSettings/src/com/android/tv/quicksettings/SettingsDialog.java
@@ -15,14 +15,14 @@
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v17.leanback.widget.OnChildSelectedListener;
-import android.support.v17.leanback.widget.VerticalGridView;
+import androidx.leanback.widget.OnChildSelectedListener;
+import androidx.leanback.widget.VerticalGridView;
import android.util.Log;
import android.view.Gravity;
import android.view.KeyEvent;
diff --git a/Settings/Android.mk b/Settings/Android.mk
index 2ab48f7..3568ebd 100644
--- a/Settings/Android.mk
+++ b/Settings/Android.mk
@@ -25,16 +25,16 @@
LOCAL_PRIVILEGED_MODULE := true
LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-v7-recyclerview \
- android-support-v7-preference \
- android-support-v7-appcompat \
- android-support-v14-preference \
- android-support-v17-preference-leanback \
- android-support-v17-leanback \
- android-arch-lifecycle-extensions
+ androidx.recyclerview_recyclerview \
+ androidx.preference_preference \
+ androidx.appcompat_appcompat \
+ androidx.legacy_legacy-preference-v14 \
+ androidx.leanback_leanback-preference \
+ androidx.leanback_leanback \
+ androidx.lifecycle_lifecycle-extensions
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-arch-lifecycle-common-java8
+ androidx.lifecycle_lifecycle-common-java8
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/Settings/AndroidManifest.xml b/Settings/AndroidManifest.xml
index 160f97b..25dc77e 100644
--- a/Settings/AndroidManifest.xml
+++ b/Settings/AndroidManifest.xml
@@ -688,7 +688,7 @@
Note that "com.android.settings.files" is set here as its authorities because a Uri
permission grant should be allowed to share a file with an external browser but it is
allowed only for Settings' authorities in ActivityManagerService. -->
- <provider android:name="android.support.v4.content.FileProvider"
+ <provider android:name="androidx.core.content.FileProvider"
android:authorities="com.android.settings.files"
android:grantUriPermissions="true"
android:exported="false">
diff --git a/Settings/proguard.cfg b/Settings/proguard.cfg
index 057e3c2..21db904 100644
--- a/Settings/proguard.cfg
+++ b/Settings/proguard.cfg
@@ -12,10 +12,10 @@
-keep public class * extends android.content.ContentProvider
-keep public class * extends android.app.backup.BackupAgentHelper
-keep public class * extends android.preference.Preference
--keep public class android.support.v7.preference.Preference {
+-keep public class androidx.preference.Preference {
public <init>(android.content.Context, android.util.AttributeSet);
}
--keep public class * extends android.support.v7.preference.Preference {
+-keep public class * extends androidx.preference.Preference {
public <init>(android.content.Context, android.util.AttributeSet);
}
-keep public class com.android.vending.licensing.ILicensingService
@@ -45,18 +45,18 @@
public static final android.os.Parcelable$Creator *;
}
--keep @android.support.annotation.Keep class *
+-keep @androidx.annotation.Keep class *
-keepclassmembers class * {
- @android.support.annotation.Keep *;
+ @androidx.annotation.Keep *;
}
-dontwarn org.bouncycastle.x509.util.LDAPStoreHelper
-dontwarn org.bouncycastle.jce.provider.X509LDAPCertStoreSpi
-dontwarn org.bouncycastle.util.io.pem.AllTests
-dontwarn org.bouncycastle.util.AllTests
--dontwarn android.support.v13.app.FragmentCompatICSMR1
--dontwarn android.support.v4.view.ViewCompatJellybeanMr1
+-dontwarn androidx.legacy.app.FragmentCompatICSMR1
+-dontwarn androidx.core.view.ViewCompatJellybeanMr1
-dontwarn org.bouncycastle.x509.X509V3CertificateGenerator
-dontwarn org.bouncycastle.jce.provider.BouncyCastleProvider
--dontwarn android.arch.core.executor.ArchTaskExecutor
--dontwarn android.arch.core.util.Function
\ No newline at end of file
+-dontwarn androidx.arch.core.executor.ArchTaskExecutor
+-dontwarn androidx.arch.core.util.Function
\ No newline at end of file
diff --git a/Settings/res/layout/account_content_area.xml b/Settings/res/layout/account_content_area.xml
index b5a3179..d0055d9 100644
--- a/Settings/res/layout/account_content_area.xml
+++ b/Settings/res/layout/account_content_area.xml
@@ -17,7 +17,7 @@
This is the template to be used for the content are of a setup fragment
which has a standard description and action.
-->
-<android.support.v17.leanback.widget.NonOverlappingRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.leanback.widget.NonOverlappingRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
@@ -36,4 +36,4 @@
android:layout_centerVertical="true"
android:layout_toEndOf="@id/description" />
-</android.support.v17.leanback.widget.NonOverlappingRelativeLayout>
+</androidx.leanback.widget.NonOverlappingRelativeLayout>
diff --git a/Settings/res/layout/date_picker_widget.xml b/Settings/res/layout/date_picker_widget.xml
index 4c0c83b..f6588e8 100644
--- a/Settings/res/layout/date_picker_widget.xml
+++ b/Settings/res/layout/date_picker_widget.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<android.support.v17.leanback.widget.picker.DatePicker
+<androidx.leanback.widget.picker.DatePicker
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/date_picker"
android:focusable="false"
diff --git a/Settings/res/layout/leanback_list_preference_fragment.xml b/Settings/res/layout/leanback_list_preference_fragment.xml
index d5522c8..bdbcb11 100644
--- a/Settings/res/layout/leanback_list_preference_fragment.xml
+++ b/Settings/res/layout/leanback_list_preference_fragment.xml
@@ -59,7 +59,7 @@
android:paddingEnd="56dp"
android:visibility="gone" />
- <android.support.v17.leanback.widget.VerticalGridView
+ <androidx.leanback.widget.VerticalGridView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/Settings/res/layout/setup_list_view.xml b/Settings/res/layout/setup_list_view.xml
index dd22bc9..f5a3f7a 100644
--- a/Settings/res/layout/setup_list_view.xml
+++ b/Settings/res/layout/setup_list_view.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<android.support.v17.leanback.widget.VerticalGridView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.leanback.widget.VerticalGridView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/account_sign_in_scroll_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -26,4 +26,4 @@
android:enabled="true"
android:focusable="true" >
<requestFocus />
-</android.support.v17.leanback.widget.VerticalGridView >
+</androidx.leanback.widget.VerticalGridView >
diff --git a/Settings/res/layout/time_picker_widget.xml b/Settings/res/layout/time_picker_widget.xml
index 644bc87..79b16c5 100644
--- a/Settings/res/layout/time_picker_widget.xml
+++ b/Settings/res/layout/time_picker_widget.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<android.support.v17.leanback.widget.picker.TimePicker
+<androidx.leanback.widget.picker.TimePicker
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/time_picker"
android:focusable="false"
diff --git a/Settings/src/com/android/tv/settings/BaseSettingsFragment.java b/Settings/src/com/android/tv/settings/BaseSettingsFragment.java
index 92e3fa4..ad87a30 100644
--- a/Settings/src/com/android/tv/settings/BaseSettingsFragment.java
+++ b/Settings/src/com/android/tv/settings/BaseSettingsFragment.java
@@ -17,12 +17,12 @@
package com.android.tv.settings;
import android.app.Fragment;
-import android.support.annotation.NonNull;
-import android.support.v14.preference.PreferenceDialogFragment;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v17.preference.LeanbackSettingsFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.NonNull;
+import androidx.preference.PreferenceDialogFragment;
+import androidx.preference.PreferenceFragment;
+import androidx.leanback.preference.LeanbackSettingsFragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.tv.settings.system.LeanbackPickerDialogFragment;
import com.android.tv.settings.system.LeanbackPickerDialogPreference;
diff --git a/Settings/src/com/android/tv/settings/HotwordSwitchController.java b/Settings/src/com/android/tv/settings/HotwordSwitchController.java
index 57f97fb..9826ada 100644
--- a/Settings/src/com/android/tv/settings/HotwordSwitchController.java
+++ b/Settings/src/com/android/tv/settings/HotwordSwitchController.java
@@ -24,8 +24,8 @@
import android.database.Cursor;
import android.net.Uri;
import android.os.AsyncTask;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
import android.text.TextUtils;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/LongClickPreference.java b/Settings/src/com/android/tv/settings/LongClickPreference.java
index e9c4391..c2bd37c 100644
--- a/Settings/src/com/android/tv/settings/LongClickPreference.java
+++ b/Settings/src/com/android/tv/settings/LongClickPreference.java
@@ -17,8 +17,8 @@
package com.android.tv.settings;
import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.view.View;
diff --git a/Settings/src/com/android/tv/settings/MainFragment.java b/Settings/src/com/android/tv/settings/MainFragment.java
index 2a61f65..49e5b8c 100644
--- a/Settings/src/com/android/tv/settings/MainFragment.java
+++ b/Settings/src/com/android/tv/settings/MainFragment.java
@@ -31,10 +31,10 @@
import android.content.pm.ResolveInfo;
import android.os.Bundle;
import android.service.settings.suggestions.Suggestion;
-import android.support.annotation.VisibleForTesting;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
import android.telephony.SignalStrength;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/PreferenceControllerFragment.java b/Settings/src/com/android/tv/settings/PreferenceControllerFragment.java
index eac5a5a..b14d36b 100644
--- a/Settings/src/com/android/tv/settings/PreferenceControllerFragment.java
+++ b/Settings/src/com/android/tv/settings/PreferenceControllerFragment.java
@@ -18,10 +18,10 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.XmlRes;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.XmlRes;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
import android.util.ArraySet;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/PreferenceUtils.java b/Settings/src/com/android/tv/settings/PreferenceUtils.java
index e680e34..d183b26 100644
--- a/Settings/src/com/android/tv/settings/PreferenceUtils.java
+++ b/Settings/src/com/android/tv/settings/PreferenceUtils.java
@@ -21,8 +21,8 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
import java.util.List;
diff --git a/Settings/src/com/android/tv/settings/RadioPreference.java b/Settings/src/com/android/tv/settings/RadioPreference.java
index e07dd70..b1c870c 100644
--- a/Settings/src/com/android/tv/settings/RadioPreference.java
+++ b/Settings/src/com/android/tv/settings/RadioPreference.java
@@ -18,9 +18,9 @@
import android.content.Context;
import android.content.res.TypedArray;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
import android.text.TextUtils;
import android.util.AttributeSet;
diff --git a/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java b/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java
index 74e7e24..442b84e 100644
--- a/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java
+++ b/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java
@@ -16,20 +16,20 @@
package com.android.tv.settings;
-import static android.arch.lifecycle.Lifecycle.Event.ON_CREATE;
-import static android.arch.lifecycle.Lifecycle.Event.ON_DESTROY;
-import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
-import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
-import static android.arch.lifecycle.Lifecycle.Event.ON_START;
-import static android.arch.lifecycle.Lifecycle.Event.ON_STOP;
+import static androidx.lifecycle.Lifecycle.Event.ON_CREATE;
+import static androidx.lifecycle.Lifecycle.Event.ON_DESTROY;
+import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
+import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
+import static androidx.lifecycle.Lifecycle.Event.ON_START;
+import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
import android.annotation.CallSuper;
-import android.arch.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleOwner;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.preference.LeanbackPreferenceFragment;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.NonNull;
+import androidx.leanback.preference.LeanbackPreferenceFragment;
+import androidx.preference.PreferenceScreen;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
diff --git a/Settings/src/com/android/tv/settings/TvSettingsActivity.java b/Settings/src/com/android/tv/settings/TvSettingsActivity.java
index ac2f0af..5a3657b 100644
--- a/Settings/src/com/android/tv/settings/TvSettingsActivity.java
+++ b/Settings/src/com/android/tv/settings/TvSettingsActivity.java
@@ -20,7 +20,7 @@
import android.app.Fragment;
import android.content.SharedPreferences;
import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.transition.Scene;
import android.transition.Slide;
import android.transition.Transition;
diff --git a/Settings/src/com/android/tv/settings/about/AboutFragment.java b/Settings/src/com/android/tv/settings/about/AboutFragment.java
index 2bf3d49..c7d5805 100644
--- a/Settings/src/com/android/tv/settings/about/AboutFragment.java
+++ b/Settings/src/com/android/tv/settings/about/AboutFragment.java
@@ -28,11 +28,11 @@
import android.os.SystemClock;
import android.os.SystemProperties;
import android.os.UserManager;
-import android.support.annotation.Nullable;
-import android.support.v17.preference.LeanbackSettingsFragment;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.Nullable;
+import androidx.leanback.preference.LeanbackSettingsFragment;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.telephony.CarrierConfigManager;
import android.text.TextUtils;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/about/LegalFragment.java b/Settings/src/com/android/tv/settings/about/LegalFragment.java
index 71c770b..fa35dae 100644
--- a/Settings/src/com/android/tv/settings/about/LegalFragment.java
+++ b/Settings/src/com/android/tv/settings/about/LegalFragment.java
@@ -18,8 +18,8 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.Keep;
+import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.PreferenceUtils;
diff --git a/Settings/src/com/android/tv/settings/about/LicenseActivity.java b/Settings/src/com/android/tv/settings/about/LicenseActivity.java
index 95a3474..951ec47 100644
--- a/Settings/src/com/android/tv/settings/about/LicenseActivity.java
+++ b/Settings/src/com/android/tv/settings/about/LicenseActivity.java
@@ -25,8 +25,8 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.SystemProperties;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.content.FileProvider;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.content.FileProvider;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
diff --git a/Settings/src/com/android/tv/settings/about/RebootConfirmFragment.java b/Settings/src/com/android/tv/settings/about/RebootConfirmFragment.java
index 8760055..5cc4e92 100644
--- a/Settings/src/com/android/tv/settings/about/RebootConfirmFragment.java
+++ b/Settings/src/com/android/tv/settings/about/RebootConfirmFragment.java
@@ -20,11 +20,11 @@
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.PowerManager;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import android.view.View;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityFragment.java
index 5479872..c97858e 100644
--- a/Settings/src/com/android/tv/settings/accessibility/AccessibilityFragment.java
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityFragment.java
@@ -21,11 +21,11 @@
import android.content.pm.ServiceInfo;
import android.os.Bundle;
import android.provider.Settings;
-import android.support.annotation.Keep;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.annotation.Keep;
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.TwoStatePreference;
import android.text.TextUtils;
import android.view.accessibility.AccessibilityManager;
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceConfirmationFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceConfirmationFragment.java
index c456e04..1c6822d 100644
--- a/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceConfirmationFragment.java
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceConfirmationFragment.java
@@ -20,10 +20,10 @@
import android.content.ComponentName;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceFragment.java
index 1353f77..7ee0b98 100644
--- a/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceFragment.java
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceFragment.java
@@ -20,11 +20,11 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.annotation.NonNull;
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutFragment.java
index 653c740..5a6fe8b 100644
--- a/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutFragment.java
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutFragment.java
@@ -23,9 +23,9 @@
import android.os.Bundle;
import android.os.UserHandle;
import android.provider.Settings;
-import android.support.annotation.Keep;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.annotation.Keep;
+import androidx.preference.Preference;
+import androidx.preference.TwoStatePreference;
import android.text.TextUtils;
import android.view.accessibility.AccessibilityManager;
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutServiceFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutServiceFragment.java
index 605b08f..e77b58d 100644
--- a/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutServiceFragment.java
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutServiceFragment.java
@@ -23,10 +23,10 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.provider.Settings;
-import android.support.annotation.Keep;
-import android.support.v17.preference.LeanbackSettingsFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.Keep;
+import androidx.leanback.preference.LeanbackSettingsFragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import android.view.accessibility.AccessibilityManager;
diff --git a/Settings/src/com/android/tv/settings/accessories/AccessoriesFragment.java b/Settings/src/com/android/tv/settings/accessories/AccessoriesFragment.java
index ee5e46f..bb7ac2e 100644
--- a/Settings/src/com/android/tv/settings/accessories/AccessoriesFragment.java
+++ b/Settings/src/com/android/tv/settings/accessories/AccessoriesFragment.java
@@ -23,9 +23,9 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.Keep;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.ArraySet;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/accessories/AccessoryUtils.java b/Settings/src/com/android/tv/settings/accessories/AccessoryUtils.java
index 33449c7..52dfac6 100644
--- a/Settings/src/com/android/tv/settings/accessories/AccessoryUtils.java
+++ b/Settings/src/com/android/tv/settings/accessories/AccessoryUtils.java
@@ -18,8 +18,8 @@
import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java b/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java
index 2ca166d..9142203 100644
--- a/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java
+++ b/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java
@@ -25,7 +25,7 @@
import android.os.Handler;
import android.os.Message;
import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.transition.TransitionManager;
import android.util.Log;
import android.view.KeyEvent;
diff --git a/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java b/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java
index 8b0c5c7..a510f31 100644
--- a/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java
+++ b/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java
@@ -16,11 +16,11 @@
package com.android.tv.settings.accessories;
-import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
-import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
+import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
+import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
import android.annotation.CallSuper;
-import android.arch.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleOwner;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.graphics.Bitmap;
@@ -28,11 +28,11 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.widget.VerticalGridView;
-import android.support.v17.preference.BaseLeanbackPreferenceFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.NonNull;
+import androidx.leanback.widget.VerticalGridView;
+import androidx.leanback.preference.BaseLeanbackPreferenceFragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.util.SparseArray;
import com.android.internal.logging.nano.MetricsProto;
diff --git a/Settings/src/com/android/tv/settings/accessories/BluetoothAccessoryFragment.java b/Settings/src/com/android/tv/settings/accessories/BluetoothAccessoryFragment.java
index 75842e1..8488278 100644
--- a/Settings/src/com/android/tv/settings/accessories/BluetoothAccessoryFragment.java
+++ b/Settings/src/com/android/tv/settings/accessories/BluetoothAccessoryFragment.java
@@ -29,14 +29,14 @@
import android.content.IntentFilter;
import android.os.Bundle;
import android.os.Handler;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/accessories/BluetoothPairingDialog.java b/Settings/src/com/android/tv/settings/accessories/BluetoothPairingDialog.java
index 531fd50..63638e3 100644
--- a/Settings/src/com/android/tv/settings/accessories/BluetoothPairingDialog.java
+++ b/Settings/src/com/android/tv/settings/accessories/BluetoothPairingDialog.java
@@ -24,8 +24,8 @@
import android.content.IntentFilter;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.text.Html;
import android.text.InputFilter;
import android.text.InputFilter.LengthFilter;
diff --git a/Settings/src/com/android/tv/settings/accessories/BluetoothRequestPermissionActivity.java b/Settings/src/com/android/tv/settings/accessories/BluetoothRequestPermissionActivity.java
index 95de9ab..aad4556 100644
--- a/Settings/src/com/android/tv/settings/accessories/BluetoothRequestPermissionActivity.java
+++ b/Settings/src/com/android/tv/settings/accessories/BluetoothRequestPermissionActivity.java
@@ -18,7 +18,7 @@
import android.app.Activity;
import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
public class BluetoothRequestPermissionActivity extends Activity {
diff --git a/Settings/src/com/android/tv/settings/accounts/AccountSyncFragment.java b/Settings/src/com/android/tv/settings/accounts/AccountSyncFragment.java
index d946196..ebf705a 100644
--- a/Settings/src/com/android/tv/settings/accounts/AccountSyncFragment.java
+++ b/Settings/src/com/android/tv/settings/accounts/AccountSyncFragment.java
@@ -31,8 +31,8 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.UserHandle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java b/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java
index 1878f82..4273f06 100644
--- a/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java
+++ b/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java
@@ -27,9 +27,9 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.UserHandle;
-import android.support.annotation.Keep;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.Keep;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.ArraySet;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/accounts/RemoveAccountDialog.java b/Settings/src/com/android/tv/settings/accounts/RemoveAccountDialog.java
index 1a8c878..f0b0368 100644
--- a/Settings/src/com/android/tv/settings/accounts/RemoveAccountDialog.java
+++ b/Settings/src/com/android/tv/settings/accounts/RemoveAccountDialog.java
@@ -26,10 +26,10 @@
import android.app.ActivityManager;
import android.os.Bundle;
import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import android.util.Log;
import android.widget.Toast;
diff --git a/Settings/src/com/android/tv/settings/accounts/SyncStateSwitchPreference.java b/Settings/src/com/android/tv/settings/accounts/SyncStateSwitchPreference.java
index b64eb07..1d5624f 100644
--- a/Settings/src/com/android/tv/settings/accounts/SyncStateSwitchPreference.java
+++ b/Settings/src/com/android/tv/settings/accounts/SyncStateSwitchPreference.java
@@ -19,8 +19,8 @@
import android.accounts.Account;
import android.app.ActivityManager;
import android.content.Context;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.SwitchPreference;
+import androidx.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
diff --git a/Settings/src/com/android/tv/settings/autofill/AutofillHelper.java b/Settings/src/com/android/tv/settings/autofill/AutofillHelper.java
index a94d598..0a5c49e 100644
--- a/Settings/src/com/android/tv/settings/autofill/AutofillHelper.java
+++ b/Settings/src/com/android/tv/settings/autofill/AutofillHelper.java
@@ -26,8 +26,8 @@
import android.provider.Settings;
import android.service.autofill.AutofillService;
import android.service.autofill.AutofillServiceInfo;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/autofill/AutofillPickerFragment.java b/Settings/src/com/android/tv/settings/autofill/AutofillPickerFragment.java
index fe48c24..78d5dd2 100644
--- a/Settings/src/com/android/tv/settings/autofill/AutofillPickerFragment.java
+++ b/Settings/src/com/android/tv/settings/autofill/AutofillPickerFragment.java
@@ -23,10 +23,10 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.UserHandle;
-import android.support.annotation.Keep;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.Keep;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.text.Html;
import android.widget.Button;
diff --git a/Settings/src/com/android/tv/settings/connectivity/AddWifiNetworkActivity.java b/Settings/src/com/android/tv/settings/connectivity/AddWifiNetworkActivity.java
index e35802d..53c6d67 100644
--- a/Settings/src/com/android/tv/settings/connectivity/AddWifiNetworkActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/AddWifiNetworkActivity.java
@@ -16,10 +16,10 @@
package com.android.tv.settings.connectivity;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/connectivity/CollapsibleCategory.java b/Settings/src/com/android/tv/settings/connectivity/CollapsibleCategory.java
index c1162aa..bb90896 100644
--- a/Settings/src/com/android/tv/settings/connectivity/CollapsibleCategory.java
+++ b/Settings/src/com/android/tv/settings/connectivity/CollapsibleCategory.java
@@ -17,7 +17,7 @@
package com.android.tv.settings.connectivity;
import android.content.Context;
-import android.support.v7.preference.PreferenceCategory;
+import androidx.preference.PreferenceCategory;
import android.util.AttributeSet;
public class CollapsibleCategory extends PreferenceCategory {
diff --git a/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java b/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
index 81147e8..a0843a4 100644
--- a/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
+++ b/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
@@ -29,7 +29,7 @@
import android.net.NetworkInfo;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
-import android.support.annotation.UiThread;
+import androidx.annotation.UiThread;
import android.telephony.PhoneStateListener;
import android.telephony.SignalStrength;
import android.telephony.TelephonyManager;
diff --git a/Settings/src/com/android/tv/settings/connectivity/EditIpSettingsActivity.java b/Settings/src/com/android/tv/settings/connectivity/EditIpSettingsActivity.java
index aa5a391..0c41e12 100644
--- a/Settings/src/com/android/tv/settings/connectivity/EditIpSettingsActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/EditIpSettingsActivity.java
@@ -16,13 +16,13 @@
package com.android.tv.settings.connectivity;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.content.Intent;
import android.net.wifi.WifiConfiguration;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/connectivity/EditProxySettingsActivity.java b/Settings/src/com/android/tv/settings/connectivity/EditProxySettingsActivity.java
index a070550..67f44f4 100644
--- a/Settings/src/com/android/tv/settings/connectivity/EditProxySettingsActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/EditProxySettingsActivity.java
@@ -16,13 +16,13 @@
package com.android.tv.settings.connectivity;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.content.Intent;
import android.net.wifi.WifiConfiguration;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/connectivity/EditSettingsInfo.java b/Settings/src/com/android/tv/settings/connectivity/EditSettingsInfo.java
index d9196bd..6111ddb 100644
--- a/Settings/src/com/android/tv/settings/connectivity/EditSettingsInfo.java
+++ b/Settings/src/com/android/tv/settings/connectivity/EditSettingsInfo.java
@@ -16,7 +16,7 @@
package com.android.tv.settings.connectivity;
-import android.arch.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModel;
/**
* Store the information for EditIpSettings and EditProxySettings flows.
diff --git a/Settings/src/com/android/tv/settings/connectivity/EnterAdvancedFlowOrRetryState.java b/Settings/src/com/android/tv/settings/connectivity/EnterAdvancedFlowOrRetryState.java
index 54ec80f..6d63d91 100644
--- a/Settings/src/com/android/tv/settings/connectivity/EnterAdvancedFlowOrRetryState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/EnterAdvancedFlowOrRetryState.java
@@ -16,9 +16,9 @@
package com.android.tv.settings.connectivity;
-import android.arch.lifecycle.ViewModelProviders;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.connectivity.setup.AdvancedOptionsFlowInfo;
import com.android.tv.settings.connectivity.util.State;
diff --git a/Settings/src/com/android/tv/settings/connectivity/FinishState.java b/Settings/src/com/android/tv/settings/connectivity/FinishState.java
index ba0a915..6eeae36 100644
--- a/Settings/src/com/android/tv/settings/connectivity/FinishState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/FinishState.java
@@ -16,9 +16,9 @@
package com.android.tv.settings.connectivity;
-import android.arch.lifecycle.ViewModelProviders;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.connectivity.util.State;
import com.android.tv.settings.connectivity.util.StateMachine;
diff --git a/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java b/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java
index d367fdf..15e920a 100644
--- a/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java
@@ -22,10 +22,10 @@
import android.os.Handler;
import android.os.SystemClock;
import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.TwoStatePreference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.wifi.AccessPoint;
diff --git a/Settings/src/com/android/tv/settings/connectivity/SaveFailedState.java b/Settings/src/com/android/tv/settings/connectivity/SaveFailedState.java
index 4523a05..cbb49ad 100644
--- a/Settings/src/com/android/tv/settings/connectivity/SaveFailedState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/SaveFailedState.java
@@ -16,13 +16,13 @@
package com.android.tv.settings.connectivity;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.setup.WifiConnectivityGuidedStepFragment;
diff --git a/Settings/src/com/android/tv/settings/connectivity/SaveState.java b/Settings/src/com/android/tv/settings/connectivity/SaveState.java
index 5e2f30b..1f53aea 100644
--- a/Settings/src/com/android/tv/settings/connectivity/SaveState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/SaveState.java
@@ -16,11 +16,11 @@
package com.android.tv.settings.connectivity;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.net.wifi.WifiManager;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.setup.AdvancedOptionsFlowInfo;
diff --git a/Settings/src/com/android/tv/settings/connectivity/SaveSuccessState.java b/Settings/src/com/android/tv/settings/connectivity/SaveSuccessState.java
index 75971b5..0d43f60 100644
--- a/Settings/src/com/android/tv/settings/connectivity/SaveSuccessState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/SaveSuccessState.java
@@ -17,12 +17,12 @@
package com.android.tv.settings.connectivity;
import android.app.Activity;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.setup.MessageFragment;
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java b/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java
index 6ba387b..76496ca 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java
@@ -16,13 +16,13 @@
package com.android.tv.settings.connectivity;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.content.Intent;
import android.net.wifi.WifiConfiguration;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settingslib.wifi.AccessPoint;
@@ -238,7 +238,7 @@
mStateMachine.back();
}
- private void updateView(android.support.v4.app.Fragment fragment, boolean movingForward) {
+ private void updateView(androidx.fragment.app.Fragment fragment, boolean movingForward) {
if (fragment != null) {
FragmentTransaction updateTransaction = getSupportFragmentManager().beginTransaction();
if (movingForward) {
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java b/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java
index 8dc7b8f..64dbe83 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java
@@ -21,11 +21,11 @@
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v7.preference.Preference;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.preference.Preference;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/AddPageBasedOnNetworkState.java b/Settings/src/com/android/tv/settings/connectivity/setup/AddPageBasedOnNetworkState.java
index 06ffd05..feaeaa6 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/AddPageBasedOnNetworkState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/AddPageBasedOnNetworkState.java
@@ -16,11 +16,11 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.WifiConfigHelper;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/AddStartState.java b/Settings/src/com/android/tv/settings/connectivity/setup/AddStartState.java
index 3244602..b012877 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/AddStartState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/AddStartState.java
@@ -16,10 +16,10 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.net.wifi.WifiConfiguration;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import android.text.TextUtils;
import com.android.settingslib.wifi.AccessPoint;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedFlowCompleteState.java b/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedFlowCompleteState.java
index 2ba5098..443b77f 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedFlowCompleteState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedFlowCompleteState.java
@@ -16,9 +16,9 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.connectivity.util.State;
import com.android.tv.settings.connectivity.util.StateMachine;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedOptionsFlowInfo.java b/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedOptionsFlowInfo.java
index 06779f4..8ac3984 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedOptionsFlowInfo.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedOptionsFlowInfo.java
@@ -16,11 +16,11 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModel;
import android.net.IpConfiguration;
import android.net.LinkAddress;
import android.net.ProxyInfo;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.text.TextUtils;
import java.lang.annotation.Retention;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedOptionsState.java b/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedOptionsState.java
index 6277da6..bb90905 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedOptionsState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedOptionsState.java
@@ -16,13 +16,13 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.util.AdvancedOptionsFlowUtil;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedWifiOptionsFlow.java b/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedWifiOptionsFlow.java
index 0fcbad0..135868c 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedWifiOptionsFlow.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedWifiOptionsFlow.java
@@ -16,10 +16,10 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.net.IpConfiguration;
-import android.support.annotation.IntDef;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.IntDef;
+import androidx.fragment.app.FragmentActivity;
import android.util.Log;
import com.android.tv.settings.connectivity.NetworkConfiguration;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/ChooseSecurityState.java b/Settings/src/com/android/tv/settings/connectivity/setup/ChooseSecurityState.java
index b008d37..07b894c 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ChooseSecurityState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ChooseSecurityState.java
@@ -16,14 +16,14 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.VisibleForTesting;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.VisibleForTesting;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.settingslib.wifi.AccessPoint;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/ConnectAuthFailureState.java b/Settings/src/com/android/tv/settings/connectivity/setup/ConnectAuthFailureState.java
index ec85a21..83c5ffa 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ConnectAuthFailureState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ConnectAuthFailureState.java
@@ -16,14 +16,14 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.VisibleForTesting;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.VisibleForTesting;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.util.State;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/ConnectFailedState.java b/Settings/src/com/android/tv/settings/connectivity/setup/ConnectFailedState.java
index dd318f2..eacd830 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ConnectFailedState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ConnectFailedState.java
@@ -16,13 +16,13 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.util.State;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/ConnectRejectedByApState.java b/Settings/src/com/android/tv/settings/connectivity/setup/ConnectRejectedByApState.java
index 4f7d35f..b57c4c2 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ConnectRejectedByApState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ConnectRejectedByApState.java
@@ -16,13 +16,13 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.util.State;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/ConnectState.java b/Settings/src/com/android/tv/settings/connectivity/setup/ConnectState.java
index aaf3610..4935af3 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ConnectState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ConnectState.java
@@ -16,7 +16,7 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -30,9 +30,9 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import android.util.Log;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/ConnectTimeOutState.java b/Settings/src/com/android/tv/settings/connectivity/setup/ConnectTimeOutState.java
index 1a51825..2fd68f8 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ConnectTimeOutState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ConnectTimeOutState.java
@@ -16,13 +16,13 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.util.State;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/Dns1State.java b/Settings/src/com/android/tv/settings/connectivity/setup/Dns1State.java
index 68a5857..2a2a2d1 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/Dns1State.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/Dns1State.java
@@ -16,15 +16,15 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.VisibleForTesting;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.VisibleForTesting;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import android.view.View;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/Dns2State.java b/Settings/src/com/android/tv/settings/connectivity/setup/Dns2State.java
index 616ffac..c522c83 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/Dns2State.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/Dns2State.java
@@ -16,14 +16,14 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import android.view.View;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/EnterPasswordState.java b/Settings/src/com/android/tv/settings/connectivity/setup/EnterPasswordState.java
index 50eb753..d285967 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/EnterPasswordState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/EnterPasswordState.java
@@ -16,16 +16,16 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.net.wifi.WifiConfiguration;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import android.text.InputType;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/EnterSsidState.java b/Settings/src/com/android/tv/settings/connectivity/setup/EnterSsidState.java
index cd53859..9df2afa 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/EnterSsidState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/EnterSsidState.java
@@ -16,15 +16,15 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import android.text.TextUtils;
import android.view.View;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/GatewayState.java b/Settings/src/com/android/tv/settings/connectivity/setup/GatewayState.java
index fbe6060..b614536 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/GatewayState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/GatewayState.java
@@ -16,15 +16,15 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import android.view.View;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/IpAddressState.java b/Settings/src/com/android/tv/settings/connectivity/setup/IpAddressState.java
index 0954fef..f9bd0fa 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/IpAddressState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/IpAddressState.java
@@ -16,14 +16,14 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import android.view.View;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/IpSettingsInvalidState.java b/Settings/src/com/android/tv/settings/connectivity/setup/IpSettingsInvalidState.java
index de8c9a0..4b29aca 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/IpSettingsInvalidState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/IpSettingsInvalidState.java
@@ -16,13 +16,13 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.util.State;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/IpSettingsState.java b/Settings/src/com/android/tv/settings/connectivity/setup/IpSettingsState.java
index cace719..aed7e24 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/IpSettingsState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/IpSettingsState.java
@@ -16,15 +16,15 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.net.IpConfiguration;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import android.text.TextUtils;
import android.view.View;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/KnownNetworkState.java b/Settings/src/com/android/tv/settings/connectivity/setup/KnownNetworkState.java
index d922a35..b17b5d8 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/KnownNetworkState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/KnownNetworkState.java
@@ -16,14 +16,14 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.net.wifi.WifiManager;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.util.State;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/MessageFragment.java b/Settings/src/com/android/tv/settings/connectivity/setup/MessageFragment.java
index 74b47b9..72df6cf 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/MessageFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/MessageFragment.java
@@ -17,7 +17,7 @@
package com.android.tv.settings.connectivity.setup;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/MessagePageFrameLayout.java b/Settings/src/com/android/tv/settings/connectivity/setup/MessagePageFrameLayout.java
index b4d0376..5d1229b 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/MessagePageFrameLayout.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/MessagePageFrameLayout.java
@@ -49,9 +49,9 @@
private static float getKeyLinePercent(Context context) {
TypedArray ta = context.getTheme().obtainStyledAttributes(
- android.support.v17.leanback.R.styleable.LeanbackGuidedStepTheme);
+ androidx.leanback.R.styleable.LeanbackGuidedStepTheme);
float percent = ta.getFloat(
- android.support.v17.leanback.R.styleable.LeanbackGuidedStepTheme_guidedStepKeyline,
+ androidx.leanback.R.styleable.LeanbackGuidedStepTheme_guidedStepKeyline,
40);
ta.recycle();
return percent;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/NetworkListInfo.java b/Settings/src/com/android/tv/settings/connectivity/setup/NetworkListInfo.java
index 258961d..b3e2eaf 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/NetworkListInfo.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/NetworkListInfo.java
@@ -16,7 +16,7 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModel;
import com.android.settingslib.wifi.WifiTracker;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/NetworkPrefixLengthState.java b/Settings/src/com/android/tv/settings/connectivity/setup/NetworkPrefixLengthState.java
index dcf25ae..55b8de0 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/NetworkPrefixLengthState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/NetworkPrefixLengthState.java
@@ -16,14 +16,14 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import android.view.View;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/OptionsOrConnectState.java b/Settings/src/com/android/tv/settings/connectivity/setup/OptionsOrConnectState.java
index 02b91cb..73fa313 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/OptionsOrConnectState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/OptionsOrConnectState.java
@@ -16,9 +16,9 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.connectivity.util.State;
import com.android.tv.settings.connectivity.util.StateMachine;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/ProxyBypassState.java b/Settings/src/com/android/tv/settings/connectivity/setup/ProxyBypassState.java
index e40cc80..4762d3c 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ProxyBypassState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ProxyBypassState.java
@@ -16,14 +16,14 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import android.view.View;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/ProxyHostNameState.java b/Settings/src/com/android/tv/settings/connectivity/setup/ProxyHostNameState.java
index d7803fe..687b6e5 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ProxyHostNameState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ProxyHostNameState.java
@@ -16,15 +16,15 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import android.view.View;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/ProxyPortState.java b/Settings/src/com/android/tv/settings/connectivity/setup/ProxyPortState.java
index dfa98fa..2dc35ec 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ProxyPortState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ProxyPortState.java
@@ -16,14 +16,14 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import android.view.View;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/ProxySettingsInvalidState.java b/Settings/src/com/android/tv/settings/connectivity/setup/ProxySettingsInvalidState.java
index 313ac72..b95269c 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ProxySettingsInvalidState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ProxySettingsInvalidState.java
@@ -17,14 +17,14 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.util.State;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/ProxySettingsState.java b/Settings/src/com/android/tv/settings/connectivity/setup/ProxySettingsState.java
index ab3ee91..b0b1918 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ProxySettingsState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ProxySettingsState.java
@@ -16,13 +16,13 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import android.text.TextUtils;
import android.view.View;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/SelectFromListWizardFragment.java b/Settings/src/com/android/tv/settings/connectivity/setup/SelectFromListWizardFragment.java
index dd1fc98..e5574e1 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/SelectFromListWizardFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/SelectFromListWizardFragment.java
@@ -27,13 +27,13 @@
import android.os.Handler;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.v17.leanback.widget.FacetProvider;
-import android.support.v17.leanback.widget.ItemAlignmentFacet;
-import android.support.v17.leanback.widget.ItemAlignmentFacet.ItemAlignmentDef;
-import android.support.v17.leanback.widget.VerticalGridView;
-import android.support.v7.util.SortedList;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.util.SortedListAdapterCallback;
+import androidx.leanback.widget.FacetProvider;
+import androidx.leanback.widget.ItemAlignmentFacet;
+import androidx.leanback.widget.ItemAlignmentFacet.ItemAlignmentDef;
+import androidx.leanback.widget.VerticalGridView;
+import androidx.recyclerview.widget.SortedList;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SortedListAdapterCallback;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/SelectWifiState.java b/Settings/src/com/android/tv/settings/connectivity/setup/SelectWifiState.java
index 2834c36..2ef5224 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/SelectWifiState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/SelectWifiState.java
@@ -16,17 +16,17 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiManager;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import android.text.TextUtils;
import android.util.Pair;
import android.view.View;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/SuccessState.java b/Settings/src/com/android/tv/settings/connectivity/setup/SuccessState.java
index 827d773..53639d1 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/SuccessState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/SuccessState.java
@@ -17,12 +17,12 @@
package com.android.tv.settings.connectivity.setup;
import android.app.Activity;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.util.State;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/SummaryConnectedNonWifiState.java b/Settings/src/com/android/tv/settings/connectivity/setup/SummaryConnectedNonWifiState.java
index 47f91cb..0461581 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/SummaryConnectedNonWifiState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/SummaryConnectedNonWifiState.java
@@ -17,13 +17,13 @@
package com.android.tv.settings.connectivity.setup;
import android.app.Activity;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.util.State;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/SummaryConnectedWifiState.java b/Settings/src/com/android/tv/settings/connectivity/setup/SummaryConnectedWifiState.java
index 7183eaa..b88c6e6 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/SummaryConnectedWifiState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/SummaryConnectedWifiState.java
@@ -17,13 +17,13 @@
package com.android.tv.settings.connectivity.setup;
import android.app.Activity;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.util.State;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/SummaryNotConnectedState.java b/Settings/src/com/android/tv/settings/connectivity/setup/SummaryNotConnectedState.java
index bed1db0..ab76cb9 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/SummaryNotConnectedState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/SummaryNotConnectedState.java
@@ -16,13 +16,13 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.util.State;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/UserChoiceInfo.java b/Settings/src/com/android/tv/settings/connectivity/setup/UserChoiceInfo.java
index 3a04cc2..e380381 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/UserChoiceInfo.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/UserChoiceInfo.java
@@ -16,10 +16,10 @@
package com.android.tv.settings.connectivity.setup;
-import android.arch.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModel;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.text.TextUtils;
import java.lang.annotation.Retention;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/WifiConnectivityGuidedStepFragment.java b/Settings/src/com/android/tv/settings/connectivity/setup/WifiConnectivityGuidedStepFragment.java
index 2b555e0..1aae6a8 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/WifiConnectivityGuidedStepFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/WifiConnectivityGuidedStepFragment.java
@@ -20,10 +20,10 @@
import android.app.Activity;
import android.content.res.Resources;
import android.os.Bundle;
-import android.support.v17.leanback.app.GuidedStepSupportFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
-import android.support.v17.leanback.widget.VerticalGridView;
+import androidx.leanback.app.GuidedStepSupportFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.leanback.widget.VerticalGridView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java b/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java
index ab851ad..ae3bba1 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java
@@ -20,15 +20,15 @@
import android.animation.AnimatorInflater;
import android.animation.ObjectAnimator;
import android.app.Activity;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.wifi.WifiInfo;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentTransaction;
import com.android.settingslib.wifi.WifiTracker;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/connectivity/util/AdvancedOptionsFlowUtil.java b/Settings/src/com/android/tv/settings/connectivity/util/AdvancedOptionsFlowUtil.java
index 458798f..e1eef69 100644
--- a/Settings/src/com/android/tv/settings/connectivity/util/AdvancedOptionsFlowUtil.java
+++ b/Settings/src/com/android/tv/settings/connectivity/util/AdvancedOptionsFlowUtil.java
@@ -16,13 +16,13 @@
package com.android.tv.settings.connectivity.util;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.net.IpConfiguration;
import android.net.LinkAddress;
import android.net.NetworkUtils;
import android.net.ProxyInfo;
import android.net.StaticIpConfiguration;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
import android.text.TextUtils;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/connectivity/util/GuidedActionsAlignUtil.java b/Settings/src/com/android/tv/settings/connectivity/util/GuidedActionsAlignUtil.java
index 54beb60..d3ef4ce 100644
--- a/Settings/src/com/android/tv/settings/connectivity/util/GuidedActionsAlignUtil.java
+++ b/Settings/src/com/android/tv/settings/connectivity/util/GuidedActionsAlignUtil.java
@@ -18,11 +18,11 @@
import android.content.Context;
import android.content.res.TypedArray;
-import android.support.v17.leanback.widget.BaseGridView;
-import android.support.v17.leanback.widget.FacetProvider;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
-import android.support.v17.leanback.widget.ItemAlignmentFacet;
-import android.support.v17.leanback.widget.VerticalGridView;
+import androidx.leanback.widget.BaseGridView;
+import androidx.leanback.widget.FacetProvider;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.leanback.widget.ItemAlignmentFacet;
+import androidx.leanback.widget.VerticalGridView;
import android.view.View;
/**
@@ -50,7 +50,7 @@
ItemAlignmentFacet.ItemAlignmentDef alignedDef =
new ItemAlignmentFacet.ItemAlignmentDef();
alignedDef.setItemAlignmentViewId(
- android.support.v17.leanback.R.id.guidedactions_item_title);
+ androidx.leanback.R.id.guidedactions_item_title);
alignedDef.setAlignedToTextViewBaseline(false);
alignedDef.setItemAlignmentOffset(0);
alignedDef.setItemAlignmentOffsetWithPadding(true);
@@ -66,9 +66,9 @@
private static float getKeyLinePercent(Context context) {
TypedArray ta = context.getTheme().obtainStyledAttributes(
- android.support.v17.leanback.R.styleable.LeanbackGuidedStepTheme);
+ androidx.leanback.R.styleable.LeanbackGuidedStepTheme);
float percent = ta.getFloat(
- android.support.v17.leanback.R.styleable.LeanbackGuidedStepTheme_guidedStepKeyline,
+ androidx.leanback.R.styleable.LeanbackGuidedStepTheme_guidedStepKeyline,
40);
ta.recycle();
return percent;
diff --git a/Settings/src/com/android/tv/settings/connectivity/util/State.java b/Settings/src/com/android/tv/settings/connectivity/util/State.java
index 34952a7..dd10586 100644
--- a/Settings/src/com/android/tv/settings/connectivity/util/State.java
+++ b/Settings/src/com/android/tv/settings/connectivity/util/State.java
@@ -17,7 +17,7 @@
package com.android.tv.settings.connectivity.util;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
/**
* State used by {@link StateMachine}.
diff --git a/Settings/src/com/android/tv/settings/connectivity/util/StateMachine.java b/Settings/src/com/android/tv/settings/connectivity/util/StateMachine.java
index c7b01db..f7043f2 100644
--- a/Settings/src/com/android/tv/settings/connectivity/util/StateMachine.java
+++ b/Settings/src/com/android/tv/settings/connectivity/util/StateMachine.java
@@ -17,8 +17,8 @@
package com.android.tv.settings.connectivity.util;
import android.app.Activity;
-import android.arch.lifecycle.ViewModel;
-import android.support.annotation.IntDef;
+import androidx.lifecycle.ViewModel;
+import androidx.annotation.IntDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/Settings/src/com/android/tv/settings/core/instrumentation/InstrumentedActivity.java b/Settings/src/com/android/tv/settings/core/instrumentation/InstrumentedActivity.java
index 3c6ac53..c6c4528 100644
--- a/Settings/src/com/android/tv/settings/core/instrumentation/InstrumentedActivity.java
+++ b/Settings/src/com/android/tv/settings/core/instrumentation/InstrumentedActivity.java
@@ -17,7 +17,7 @@
package com.android.tv.settings.core.instrumentation;
import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
import com.android.settingslib.core.instrumentation.Instrumentable;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
diff --git a/Settings/src/com/android/tv/settings/device/DevicePrefFragment.java b/Settings/src/com/android/tv/settings/device/DevicePrefFragment.java
index 76db033..2b3679d 100644
--- a/Settings/src/com/android/tv/settings/device/DevicePrefFragment.java
+++ b/Settings/src/com/android/tv/settings/device/DevicePrefFragment.java
@@ -24,9 +24,9 @@
import android.media.tv.TvInputManager;
import android.os.Bundle;
import android.os.UserHandle;
-import android.support.annotation.Keep;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
+import androidx.annotation.Keep;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
import android.text.TextUtils;
import android.util.Log;
import android.view.inputmethod.InputMethodInfo;
diff --git a/Settings/src/com/android/tv/settings/device/StorageSummaryFragment.java b/Settings/src/com/android/tv/settings/device/StorageSummaryFragment.java
index 38f899a..8c0a625 100644
--- a/Settings/src/com/android/tv/settings/device/StorageSummaryFragment.java
+++ b/Settings/src/com/android/tv/settings/device/StorageSummaryFragment.java
@@ -23,9 +23,9 @@
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
import android.os.storage.VolumeRecord;
-import android.support.annotation.Keep;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
+import androidx.annotation.Keep;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
import android.util.ArraySet;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/device/apps/AllAppsFragment.java b/Settings/src/com/android/tv/settings/device/apps/AllAppsFragment.java
index f8454a3..2a3e5eb 100644
--- a/Settings/src/com/android/tv/settings/device/apps/AllAppsFragment.java
+++ b/Settings/src/com/android/tv/settings/device/apps/AllAppsFragment.java
@@ -19,9 +19,9 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.ArraySet;
diff --git a/Settings/src/com/android/tv/settings/device/apps/AppActionPreference.java b/Settings/src/com/android/tv/settings/device/apps/AppActionPreference.java
index 9940a08..60d31d1 100644
--- a/Settings/src/com/android/tv/settings/device/apps/AppActionPreference.java
+++ b/Settings/src/com/android/tv/settings/device/apps/AppActionPreference.java
@@ -18,10 +18,10 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v7.preference.Preference;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidedAction;
+import androidx.preference.Preference;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/tv/settings/device/apps/AppManagementFragment.java b/Settings/src/com/android/tv/settings/device/apps/AppManagementFragment.java
index 077125d..38a56a5 100644
--- a/Settings/src/com/android/tv/settings/device/apps/AppManagementFragment.java
+++ b/Settings/src/com/android/tv/settings/device/apps/AppManagementFragment.java
@@ -27,9 +27,9 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.UserHandle;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
diff --git a/Settings/src/com/android/tv/settings/device/apps/AppsFragment.java b/Settings/src/com/android/tv/settings/device/apps/AppsFragment.java
index c1d5e2b..448c9e9 100644
--- a/Settings/src/com/android/tv/settings/device/apps/AppsFragment.java
+++ b/Settings/src/com/android/tv/settings/device/apps/AppsFragment.java
@@ -20,7 +20,7 @@
import android.app.Application;
import android.content.Context;
import android.os.Bundle;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
diff --git a/Settings/src/com/android/tv/settings/device/apps/ClearCachePreference.java b/Settings/src/com/android/tv/settings/device/apps/ClearCachePreference.java
index 9bb8c53..0290f5c 100644
--- a/Settings/src/com/android/tv/settings/device/apps/ClearCachePreference.java
+++ b/Settings/src/com/android/tv/settings/device/apps/ClearCachePreference.java
@@ -18,8 +18,8 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.widget.GuidanceStylist;
+import androidx.annotation.NonNull;
+import androidx.leanback.widget.GuidanceStylist;
import android.text.format.Formatter;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/tv/settings/device/apps/ClearDataPreference.java b/Settings/src/com/android/tv/settings/device/apps/ClearDataPreference.java
index 4186df6..f0f4f0e 100644
--- a/Settings/src/com/android/tv/settings/device/apps/ClearDataPreference.java
+++ b/Settings/src/com/android/tv/settings/device/apps/ClearDataPreference.java
@@ -18,8 +18,8 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.widget.GuidanceStylist;
+import androidx.annotation.NonNull;
+import androidx.leanback.widget.GuidanceStylist;
import android.text.format.Formatter;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/tv/settings/device/apps/ClearDefaultsPreference.java b/Settings/src/com/android/tv/settings/device/apps/ClearDefaultsPreference.java
index 05e3eb6..ed718a6 100644
--- a/Settings/src/com/android/tv/settings/device/apps/ClearDefaultsPreference.java
+++ b/Settings/src/com/android/tv/settings/device/apps/ClearDefaultsPreference.java
@@ -24,8 +24,8 @@
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.widget.GuidanceStylist;
+import androidx.annotation.NonNull;
+import androidx.leanback.widget.GuidanceStylist;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/tv/settings/device/apps/EnableDisablePreference.java b/Settings/src/com/android/tv/settings/device/apps/EnableDisablePreference.java
index c90627f..48cbae0 100644
--- a/Settings/src/com/android/tv/settings/device/apps/EnableDisablePreference.java
+++ b/Settings/src/com/android/tv/settings/device/apps/EnableDisablePreference.java
@@ -22,8 +22,8 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.widget.GuidanceStylist;
+import androidx.annotation.NonNull;
+import androidx.leanback.widget.GuidanceStylist;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settingslib.Utils;
diff --git a/Settings/src/com/android/tv/settings/device/apps/ForceStopPreference.java b/Settings/src/com/android/tv/settings/device/apps/ForceStopPreference.java
index 8c26af8..35dbf00 100644
--- a/Settings/src/com/android/tv/settings/device/apps/ForceStopPreference.java
+++ b/Settings/src/com/android/tv/settings/device/apps/ForceStopPreference.java
@@ -26,8 +26,8 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.UserHandle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.widget.GuidanceStylist;
+import androidx.annotation.NonNull;
+import androidx.leanback.widget.GuidanceStylist;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/tv/settings/device/apps/MoveAppActivity.java b/Settings/src/com/android/tv/settings/device/apps/MoveAppActivity.java
index f387bd3..f8ced4e 100644
--- a/Settings/src/com/android/tv/settings/device/apps/MoveAppActivity.java
+++ b/Settings/src/com/android/tv/settings/device/apps/MoveAppActivity.java
@@ -26,7 +26,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.storage.VolumeInfo;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.util.Log;
import android.widget.Toast;
diff --git a/Settings/src/com/android/tv/settings/device/apps/NotificationsPreference.java b/Settings/src/com/android/tv/settings/device/apps/NotificationsPreference.java
index 7e8de88..069e357 100644
--- a/Settings/src/com/android/tv/settings/device/apps/NotificationsPreference.java
+++ b/Settings/src/com/android/tv/settings/device/apps/NotificationsPreference.java
@@ -20,8 +20,8 @@
import android.app.NotificationManager;
import android.content.Context;
import android.os.RemoteException;
-import android.support.annotation.NonNull;
-import android.support.v14.preference.SwitchPreference;
+import androidx.annotation.NonNull;
+import androidx.preference.SwitchPreference;
import android.util.Log;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/tv/settings/device/apps/RecentAppsPreferenceController.java b/Settings/src/com/android/tv/settings/device/apps/RecentAppsPreferenceController.java
index 921680f..043193c 100644
--- a/Settings/src/com/android/tv/settings/device/apps/RecentAppsPreferenceController.java
+++ b/Settings/src/com/android/tv/settings/device/apps/RecentAppsPreferenceController.java
@@ -23,10 +23,10 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.UserHandle;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.ArraySet;
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/AppUsageAccess.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/AppUsageAccess.java
index bdfae19..be0738d 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/AppUsageAccess.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/AppUsageAccess.java
@@ -19,12 +19,12 @@
import android.Manifest;
import android.app.AppOpsManager;
import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.TwoStatePreference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/ExternalSources.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/ExternalSources.java
index 6944e83..29e2f20 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/ExternalSources.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/ExternalSources.java
@@ -21,12 +21,12 @@
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.TwoStatePreference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/HighPower.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/HighPower.java
index b9c65bd..0ab2d5d 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/HighPower.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/HighPower.java
@@ -18,12 +18,12 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.TwoStatePreference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/ManageAppOp.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/ManageAppOp.java
index 9b46d8a..bb858fc 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/ManageAppOp.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/ManageAppOp.java
@@ -23,9 +23,9 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.RemoteException;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.preference.Preference;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
import android.util.Log;
import com.android.internal.util.ArrayUtils;
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/ManageApplicationsController.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/ManageApplicationsController.java
index 6e6673f..94185c7 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/ManageApplicationsController.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/ManageApplicationsController.java
@@ -17,12 +17,12 @@
package com.android.tv.settings.device.apps.specialaccess;
import android.app.Application;
-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleObserver;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/NotificationAccess.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/NotificationAccess.java
index b2d46ab..abf2b08 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/NotificationAccess.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/NotificationAccess.java
@@ -26,10 +26,10 @@
import android.os.UserHandle;
import android.provider.Settings;
import android.service.notification.NotificationListenerService;
-import android.support.annotation.Keep;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.Keep;
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.util.IconDrawableFactory;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/PictureInPicture.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/PictureInPicture.java
index 95a74e7..01da0f2 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/PictureInPicture.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/PictureInPicture.java
@@ -21,12 +21,12 @@
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.TwoStatePreference;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto;
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/SpecialAppAccess.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/SpecialAppAccess.java
index c0b45c8..4c677a9 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/SpecialAppAccess.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/SpecialAppAccess.java
@@ -19,9 +19,9 @@
import android.app.ActivityManager;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
+import androidx.annotation.Keep;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/SystemAlertWindow.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/SystemAlertWindow.java
index 65c0810..5fc340b 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/SystemAlertWindow.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/SystemAlertWindow.java
@@ -19,12 +19,12 @@
import android.Manifest;
import android.app.AppOpsManager;
import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.TwoStatePreference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/WriteSettings.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/WriteSettings.java
index fa29a50..7d9f18d 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/WriteSettings.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/WriteSettings.java
@@ -19,12 +19,12 @@
import android.Manifest;
import android.app.AppOpsManager;
import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.TwoStatePreference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.applications.ApplicationsState;
diff --git a/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamFragment.java b/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamFragment.java
index e3dd9b6..82beda6 100644
--- a/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamFragment.java
+++ b/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamFragment.java
@@ -26,8 +26,8 @@
import android.content.IntentFilter;
import android.os.Bundle;
import android.provider.Settings;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
import android.text.format.DateUtils;
import android.util.ArrayMap;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/device/display/daydream/DreamTimePreference.java b/Settings/src/com/android/tv/settings/device/display/daydream/DreamTimePreference.java
index 2bac983..5e9584e 100644
--- a/Settings/src/com/android/tv/settings/device/display/daydream/DreamTimePreference.java
+++ b/Settings/src/com/android/tv/settings/device/display/daydream/DreamTimePreference.java
@@ -17,8 +17,8 @@
package com.android.tv.settings.device.display.daydream;
import android.content.Context;
-import android.support.annotation.Keep;
-import android.support.v7.preference.ListPreference;
+import androidx.annotation.Keep;
+import androidx.preference.ListPreference;
import android.text.TextUtils;
import android.util.AttributeSet;
diff --git a/Settings/src/com/android/tv/settings/device/sound/SoundFormatPreferenceController.java b/Settings/src/com/android/tv/settings/device/sound/SoundFormatPreferenceController.java
index d36feee..d835105 100644
--- a/Settings/src/com/android/tv/settings/device/sound/SoundFormatPreferenceController.java
+++ b/Settings/src/com/android/tv/settings/device/sound/SoundFormatPreferenceController.java
@@ -19,8 +19,8 @@
import android.content.Context;
import android.media.AudioManager;
import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
import android.text.TextUtils;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/device/sound/SoundFragment.java b/Settings/src/com/android/tv/settings/device/sound/SoundFragment.java
index bb9678a..10c9917 100644
--- a/Settings/src/com/android/tv/settings/device/sound/SoundFragment.java
+++ b/Settings/src/com/android/tv/settings/device/sound/SoundFragment.java
@@ -22,12 +22,12 @@
import android.media.AudioManager;
import android.os.Bundle;
import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.preference.SwitchPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceViewHolder;
+import androidx.preference.TwoStatePreference;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
diff --git a/Settings/src/com/android/tv/settings/device/storage/BackupAppsStepFragment.java b/Settings/src/com/android/tv/settings/device/storage/BackupAppsStepFragment.java
index d23840a..6ce2ef7 100644
--- a/Settings/src/com/android/tv/settings/device/storage/BackupAppsStepFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/BackupAppsStepFragment.java
@@ -23,10 +23,10 @@
import android.os.Bundle;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import android.text.TextUtils;
import android.util.ArrayMap;
diff --git a/Settings/src/com/android/tv/settings/device/storage/ConfirmClearCacheFragment.java b/Settings/src/com/android/tv/settings/device/storage/ConfirmClearCacheFragment.java
index a8a0139..0c1e4da 100644
--- a/Settings/src/com/android/tv/settings/device/storage/ConfirmClearCacheFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/ConfirmClearCacheFragment.java
@@ -19,10 +19,10 @@
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/device/storage/ForgetPrivateConfirmFragment.java b/Settings/src/com/android/tv/settings/device/storage/ForgetPrivateConfirmFragment.java
index b8d37e6..74208b9 100644
--- a/Settings/src/com/android/tv/settings/device/storage/ForgetPrivateConfirmFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/ForgetPrivateConfirmFragment.java
@@ -19,10 +19,10 @@
import android.os.Bundle;
import android.os.storage.StorageManager;
import android.os.storage.VolumeRecord;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/device/storage/FormatActivity.java b/Settings/src/com/android/tv/settings/device/storage/FormatActivity.java
index b783de7..696d4d5 100644
--- a/Settings/src/com/android/tv/settings/device/storage/FormatActivity.java
+++ b/Settings/src/com/android/tv/settings/device/storage/FormatActivity.java
@@ -27,10 +27,10 @@
import android.os.storage.DiskInfo;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
diff --git a/Settings/src/com/android/tv/settings/device/storage/FormatAsPrivateStepFragment.java b/Settings/src/com/android/tv/settings/device/storage/FormatAsPrivateStepFragment.java
index 152c5af..d225346 100644
--- a/Settings/src/com/android/tv/settings/device/storage/FormatAsPrivateStepFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/FormatAsPrivateStepFragment.java
@@ -18,10 +18,10 @@
import android.os.Bundle;
import android.os.storage.DiskInfo;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/device/storage/FormatAsPublicStepFragment.java b/Settings/src/com/android/tv/settings/device/storage/FormatAsPublicStepFragment.java
index 45a08db..3781f59 100644
--- a/Settings/src/com/android/tv/settings/device/storage/FormatAsPublicStepFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/FormatAsPublicStepFragment.java
@@ -21,10 +21,10 @@
import android.os.storage.DiskInfo;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import android.text.TextUtils;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/device/storage/FormattingProgressFragment.java b/Settings/src/com/android/tv/settings/device/storage/FormattingProgressFragment.java
index 21a0d96..c0095c9 100644
--- a/Settings/src/com/android/tv/settings/device/storage/FormattingProgressFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/FormattingProgressFragment.java
@@ -17,7 +17,7 @@
package com.android.tv.settings.device.storage;
import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.view.View;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/device/storage/MigrateStorageActivity.java b/Settings/src/com/android/tv/settings/device/storage/MigrateStorageActivity.java
index a656eb8..5db6372 100644
--- a/Settings/src/com/android/tv/settings/device/storage/MigrateStorageActivity.java
+++ b/Settings/src/com/android/tv/settings/device/storage/MigrateStorageActivity.java
@@ -24,11 +24,11 @@
import android.os.Handler;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import android.text.TextUtils;
import android.text.format.Formatter;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/device/storage/MissingStorageFragment.java b/Settings/src/com/android/tv/settings/device/storage/MissingStorageFragment.java
index d360cf2..e58a9df 100644
--- a/Settings/src/com/android/tv/settings/device/storage/MissingStorageFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/MissingStorageFragment.java
@@ -19,9 +19,9 @@
import android.os.Bundle;
import android.os.storage.StorageManager;
import android.os.storage.VolumeRecord;
-import android.support.v17.preference.LeanbackPreferenceFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.leanback.preference.LeanbackPreferenceFragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/device/storage/MoveAppProgressFragment.java b/Settings/src/com/android/tv/settings/device/storage/MoveAppProgressFragment.java
index 570c7a7..68456b2 100644
--- a/Settings/src/com/android/tv/settings/device/storage/MoveAppProgressFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/MoveAppProgressFragment.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.view.View;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/device/storage/MoveAppStepFragment.java b/Settings/src/com/android/tv/settings/device/storage/MoveAppStepFragment.java
index dbcdf44..9157ec3 100644
--- a/Settings/src/com/android/tv/settings/device/storage/MoveAppStepFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/MoveAppStepFragment.java
@@ -22,10 +22,10 @@
import android.os.Bundle;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import android.text.TextUtils;
import android.text.format.Formatter;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java b/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java
index a683dcd..2f17f6b 100644
--- a/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java
+++ b/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java
@@ -27,11 +27,11 @@
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
import android.os.storage.VolumeRecord;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import android.text.TextUtils;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/device/storage/ResetActivity.java b/Settings/src/com/android/tv/settings/device/storage/ResetActivity.java
index d989b08..36b5611 100644
--- a/Settings/src/com/android/tv/settings/device/storage/ResetActivity.java
+++ b/Settings/src/com/android/tv/settings/device/storage/ResetActivity.java
@@ -21,10 +21,10 @@
import android.app.ActivityManager;
import android.content.Intent;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import android.util.Log;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/device/storage/SettingsStorageService.java b/Settings/src/com/android/tv/settings/device/storage/SettingsStorageService.java
index 467b03f..6678ad5 100644
--- a/Settings/src/com/android/tv/settings/device/storage/SettingsStorageService.java
+++ b/Settings/src/com/android/tv/settings/device/storage/SettingsStorageService.java
@@ -22,10 +22,10 @@
import android.os.storage.DiskInfo;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import android.text.TextUtils;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/device/storage/SlowDriveStepFragment.java b/Settings/src/com/android/tv/settings/device/storage/SlowDriveStepFragment.java
index 528b1e1..964019e 100644
--- a/Settings/src/com/android/tv/settings/device/storage/SlowDriveStepFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/SlowDriveStepFragment.java
@@ -17,10 +17,10 @@
package com.android.tv.settings.device.storage;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/device/storage/StorageFragment.java b/Settings/src/com/android/tv/settings/device/storage/StorageFragment.java
index 3e59279..77cda8f 100644
--- a/Settings/src/com/android/tv/settings/device/storage/StorageFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/StorageFragment.java
@@ -22,8 +22,8 @@
import android.os.Environment;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/device/storage/StoragePreference.java b/Settings/src/com/android/tv/settings/device/storage/StoragePreference.java
index 3b4bea8..0112e34 100644
--- a/Settings/src/com/android/tv/settings/device/storage/StoragePreference.java
+++ b/Settings/src/com/android/tv/settings/device/storage/StoragePreference.java
@@ -17,7 +17,7 @@
package com.android.tv.settings.device.storage;
import android.content.Context;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
import android.text.format.Formatter;
import android.util.AttributeSet;
diff --git a/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java b/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java
index 5d599ea..4972b0d 100644
--- a/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java
+++ b/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java
@@ -26,12 +26,12 @@
import android.os.Handler;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import android.text.TextUtils;
import android.view.View;
import android.widget.Toast;
diff --git a/Settings/src/com/android/tv/settings/dialog/PinDialogFragment.java b/Settings/src/com/android/tv/settings/dialog/PinDialogFragment.java
index 68fa92c..10a8417 100644
--- a/Settings/src/com/android/tv/settings/dialog/PinDialogFragment.java
+++ b/Settings/src/com/android/tv/settings/dialog/PinDialogFragment.java
@@ -25,7 +25,7 @@
import android.content.res.Resources;
import android.os.Bundle;
import android.os.Handler;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/dialog/ProgressDialogFragment.java b/Settings/src/com/android/tv/settings/dialog/ProgressDialogFragment.java
index 03c3676..0dbd0e1 100644
--- a/Settings/src/com/android/tv/settings/dialog/ProgressDialogFragment.java
+++ b/Settings/src/com/android/tv/settings/dialog/ProgressDialogFragment.java
@@ -19,9 +19,9 @@
import android.app.Fragment;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/Settings/src/com/android/tv/settings/dialog/old/BaseDialogFragment.java b/Settings/src/com/android/tv/settings/dialog/old/BaseDialogFragment.java
index c41e03c..7fbbd68 100644
--- a/Settings/src/com/android/tv/settings/dialog/old/BaseDialogFragment.java
+++ b/Settings/src/com/android/tv/settings/dialog/old/BaseDialogFragment.java
@@ -22,7 +22,7 @@
import android.app.Activity;
import android.content.Intent;
import android.graphics.drawable.ColorDrawable;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
diff --git a/Settings/src/com/android/tv/settings/dialog/old/DialogActivity.java b/Settings/src/com/android/tv/settings/dialog/old/DialogActivity.java
index eb4760b..0b1d290 100644
--- a/Settings/src/com/android/tv/settings/dialog/old/DialogActivity.java
+++ b/Settings/src/com/android/tv/settings/dialog/old/DialogActivity.java
@@ -27,7 +27,7 @@
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/Settings/src/com/android/tv/settings/inputmethod/AvailableVirtualKeyboardFragment.java b/Settings/src/com/android/tv/settings/inputmethod/AvailableVirtualKeyboardFragment.java
index bf0ff25..0e751a6 100644
--- a/Settings/src/com/android/tv/settings/inputmethod/AvailableVirtualKeyboardFragment.java
+++ b/Settings/src/com/android/tv/settings/inputmethod/AvailableVirtualKeyboardFragment.java
@@ -30,8 +30,8 @@
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.Keep;
+import androidx.preference.PreferenceScreen;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
diff --git a/Settings/src/com/android/tv/settings/inputmethod/InputMethodAndSubtypeEnablerFragment.java b/Settings/src/com/android/tv/settings/inputmethod/InputMethodAndSubtypeEnablerFragment.java
index 29337f4..7642d5f 100644
--- a/Settings/src/com/android/tv/settings/inputmethod/InputMethodAndSubtypeEnablerFragment.java
+++ b/Settings/src/com/android/tv/settings/inputmethod/InputMethodAndSubtypeEnablerFragment.java
@@ -18,7 +18,7 @@
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
diff --git a/Settings/src/com/android/tv/settings/inputmethod/KeyboardFragment.java b/Settings/src/com/android/tv/settings/inputmethod/KeyboardFragment.java
index e3832a9..d7303f9 100644
--- a/Settings/src/com/android/tv/settings/inputmethod/KeyboardFragment.java
+++ b/Settings/src/com/android/tv/settings/inputmethod/KeyboardFragment.java
@@ -21,12 +21,12 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.UserHandle;
-import android.support.annotation.Keep;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.Keep;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.ArraySet;
import android.view.inputmethod.InputMethodInfo;
diff --git a/Settings/src/com/android/tv/settings/name/DeviceManager.java b/Settings/src/com/android/tv/settings/name/DeviceManager.java
index ad5fe78..44109b8 100644
--- a/Settings/src/com/android/tv/settings/name/DeviceManager.java
+++ b/Settings/src/com/android/tv/settings/name/DeviceManager.java
@@ -20,7 +20,7 @@
import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import android.util.Log;
public class DeviceManager {
diff --git a/Settings/src/com/android/tv/settings/name/DeviceNameSetCustomFragment.java b/Settings/src/com/android/tv/settings/name/DeviceNameSetCustomFragment.java
index 03d0103..cb518a5 100644
--- a/Settings/src/com/android/tv/settings/name/DeviceNameSetCustomFragment.java
+++ b/Settings/src/com/android/tv/settings/name/DeviceNameSetCustomFragment.java
@@ -20,11 +20,11 @@
import android.app.FragmentManager;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/Settings/src/com/android/tv/settings/name/DeviceNameSetFragment.java b/Settings/src/com/android/tv/settings/name/DeviceNameSetFragment.java
index 17da848..8d0cfa1 100644
--- a/Settings/src/com/android/tv/settings/name/DeviceNameSetFragment.java
+++ b/Settings/src/com/android/tv/settings/name/DeviceNameSetFragment.java
@@ -19,11 +19,11 @@
import android.app.Activity;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/Settings/src/com/android/tv/settings/name/DeviceNameSettingsActivity.java b/Settings/src/com/android/tv/settings/name/DeviceNameSettingsActivity.java
index 3c1a4dc..94126cc 100644
--- a/Settings/src/com/android/tv/settings/name/DeviceNameSettingsActivity.java
+++ b/Settings/src/com/android/tv/settings/name/DeviceNameSettingsActivity.java
@@ -19,7 +19,7 @@
import android.annotation.Nullable;
import android.app.Activity;
import android.os.Bundle;
-import android.support.v17.leanback.app.GuidedStepFragment;
+import androidx.leanback.app.GuidedStepFragment;
/**
* Activity that displays Device Name settings
diff --git a/Settings/src/com/android/tv/settings/name/DeviceNameSuggestionActivity.java b/Settings/src/com/android/tv/settings/name/DeviceNameSuggestionActivity.java
index 56f6635..3c62563 100644
--- a/Settings/src/com/android/tv/settings/name/DeviceNameSuggestionActivity.java
+++ b/Settings/src/com/android/tv/settings/name/DeviceNameSuggestionActivity.java
@@ -19,7 +19,7 @@
import android.annotation.Nullable;
import android.app.Activity;
import android.os.Bundle;
-import android.support.v17.leanback.app.GuidedStepFragment;
+import androidx.leanback.app.GuidedStepFragment;
/**
* Entry activity for settings suggestions.
diff --git a/Settings/src/com/android/tv/settings/name/DeviceNameSummaryFragment.java b/Settings/src/com/android/tv/settings/name/DeviceNameSummaryFragment.java
index 8687e39..9b9ca5e 100644
--- a/Settings/src/com/android/tv/settings/name/DeviceNameSummaryFragment.java
+++ b/Settings/src/com/android/tv/settings/name/DeviceNameSummaryFragment.java
@@ -19,11 +19,11 @@
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/Settings/src/com/android/tv/settings/name/setup/DeviceNameFlowStartActivity.java b/Settings/src/com/android/tv/settings/name/setup/DeviceNameFlowStartActivity.java
index 2096d69..a3a453b 100644
--- a/Settings/src/com/android/tv/settings/name/setup/DeviceNameFlowStartActivity.java
+++ b/Settings/src/com/android/tv/settings/name/setup/DeviceNameFlowStartActivity.java
@@ -18,7 +18,7 @@
import android.annotation.Nullable;
import android.app.Activity;
import android.os.Bundle;
-import android.support.v17.leanback.app.GuidedStepFragment;
+import androidx.leanback.app.GuidedStepFragment;
import com.android.tv.settings.R;
import com.android.tv.settings.name.DeviceNameSetFragment;
diff --git a/Settings/src/com/android/tv/settings/suggestions/SuggestionPreference.java b/Settings/src/com/android/tv/settings/suggestions/SuggestionPreference.java
index 32aaf69..63d689f 100644
--- a/Settings/src/com/android/tv/settings/suggestions/SuggestionPreference.java
+++ b/Settings/src/com/android/tv/settings/suggestions/SuggestionPreference.java
@@ -19,8 +19,8 @@
import android.app.PendingIntent;
import android.content.Context;
import android.service.settings.suggestions.Suggestion;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
import android.util.Log;
import android.view.View;
diff --git a/Settings/src/com/android/tv/settings/system/CaptionFragment.java b/Settings/src/com/android/tv/settings/system/CaptionFragment.java
index 038ab3c..ede3f94 100644
--- a/Settings/src/com/android/tv/settings/system/CaptionFragment.java
+++ b/Settings/src/com/android/tv/settings/system/CaptionFragment.java
@@ -19,11 +19,11 @@
import android.content.Intent;
import android.os.Bundle;
import android.provider.Settings;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.TwoStatePreference;
import android.text.TextUtils;
import com.android.internal.app.LocalePicker;
diff --git a/Settings/src/com/android/tv/settings/system/CaptionSettingsFragment.java b/Settings/src/com/android/tv/settings/system/CaptionSettingsFragment.java
index 38f5707..313ef62 100644
--- a/Settings/src/com/android/tv/settings/system/CaptionSettingsFragment.java
+++ b/Settings/src/com/android/tv/settings/system/CaptionSettingsFragment.java
@@ -22,8 +22,8 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.annotation.NonNull;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/Settings/src/com/android/tv/settings/system/DateTimeFragment.java b/Settings/src/com/android/tv/settings/system/DateTimeFragment.java
index 25fd337..9c373c3 100644
--- a/Settings/src/com/android/tv/settings/system/DateTimeFragment.java
+++ b/Settings/src/com/android/tv/settings/system/DateTimeFragment.java
@@ -24,9 +24,9 @@
import android.os.Bundle;
import android.os.SystemProperties;
import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
+import androidx.preference.SwitchPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
import android.text.TextUtils;
import android.text.format.DateFormat;
diff --git a/Settings/src/com/android/tv/settings/system/InputCustomNameFragment.java b/Settings/src/com/android/tv/settings/system/InputCustomNameFragment.java
index c9d3917..c568018 100644
--- a/Settings/src/com/android/tv/settings/system/InputCustomNameFragment.java
+++ b/Settings/src/com/android/tv/settings/system/InputCustomNameFragment.java
@@ -17,11 +17,11 @@
package com.android.tv.settings.system;
import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/system/InputOptionsFragment.java b/Settings/src/com/android/tv/settings/system/InputOptionsFragment.java
index 57b355e..af48577 100644
--- a/Settings/src/com/android/tv/settings/system/InputOptionsFragment.java
+++ b/Settings/src/com/android/tv/settings/system/InputOptionsFragment.java
@@ -20,10 +20,10 @@
import android.media.tv.TvInputInfo;
import android.os.Bundle;
import android.os.UserHandle;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.TwoStatePreference;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
diff --git a/Settings/src/com/android/tv/settings/system/InputsFragment.java b/Settings/src/com/android/tv/settings/system/InputsFragment.java
index fb65e88..1abdc8b 100644
--- a/Settings/src/com/android/tv/settings/system/InputsFragment.java
+++ b/Settings/src/com/android/tv/settings/system/InputsFragment.java
@@ -22,9 +22,9 @@
import android.os.Bundle;
import android.os.UserHandle;
import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.TwoStatePreference;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
diff --git a/Settings/src/com/android/tv/settings/system/LanguageFragment.java b/Settings/src/com/android/tv/settings/system/LanguageFragment.java
index cc21ed1..7fc92b1 100644
--- a/Settings/src/com/android/tv/settings/system/LanguageFragment.java
+++ b/Settings/src/com/android/tv/settings/system/LanguageFragment.java
@@ -21,8 +21,8 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.RemoteException;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.util.ArrayMap;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/system/LeanbackPickerDialogFragment.java b/Settings/src/com/android/tv/settings/system/LeanbackPickerDialogFragment.java
index 9ece31a..a5e7f2f 100644
--- a/Settings/src/com/android/tv/settings/system/LeanbackPickerDialogFragment.java
+++ b/Settings/src/com/android/tv/settings/system/LeanbackPickerDialogFragment.java
@@ -19,10 +19,10 @@
import android.app.AlarmManager;
import android.content.Context;
import android.os.Bundle;
-import android.support.v17.leanback.widget.picker.DatePicker;
-import android.support.v17.leanback.widget.picker.TimePicker;
-import android.support.v17.preference.LeanbackPreferenceDialogFragment;
-import android.support.v7.preference.DialogPreference;
+import androidx.leanback.widget.picker.DatePicker;
+import androidx.leanback.widget.picker.TimePicker;
+import androidx.leanback.preference.LeanbackPreferenceDialogFragment;
+import androidx.preference.DialogPreference;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/Settings/src/com/android/tv/settings/system/LeanbackPickerDialogPreference.java b/Settings/src/com/android/tv/settings/system/LeanbackPickerDialogPreference.java
index 649e0df..076ed1a 100644
--- a/Settings/src/com/android/tv/settings/system/LeanbackPickerDialogPreference.java
+++ b/Settings/src/com/android/tv/settings/system/LeanbackPickerDialogPreference.java
@@ -18,8 +18,8 @@
import android.content.Context;
import android.content.res.TypedArray;
-import android.support.v4.content.res.TypedArrayUtils;
-import android.support.v7.preference.DialogPreference;
+import androidx.core.content.res.TypedArrayUtils;
+import androidx.preference.DialogPreference;
import android.util.AttributeSet;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/system/LocationFragment.java b/Settings/src/com/android/tv/settings/system/LocationFragment.java
index 543c501..d432598 100644
--- a/Settings/src/com/android/tv/settings/system/LocationFragment.java
+++ b/Settings/src/com/android/tv/settings/system/LocationFragment.java
@@ -25,11 +25,11 @@
import android.os.Bundle;
import android.os.UserManager;
import android.provider.Settings;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/system/SecurityFragment.java b/Settings/src/com/android/tv/settings/system/SecurityFragment.java
index 5aea622..25764d2 100644
--- a/Settings/src/com/android/tv/settings/system/SecurityFragment.java
+++ b/Settings/src/com/android/tv/settings/system/SecurityFragment.java
@@ -38,13 +38,13 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IntDef;
-import android.support.v17.preference.LeanbackSettingsFragment;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntDef;
+import androidx.leanback.preference.LeanbackSettingsFragment;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.TwoStatePreference;
import android.text.TextUtils;
import android.util.Log;
diff --git a/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java b/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java
index f366dc3..166c927 100644
--- a/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java
+++ b/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java
@@ -25,10 +25,10 @@
import android.speech.tts.TextToSpeech;
import android.speech.tts.TtsEngines;
import android.speech.tts.UtteranceProgressListener;
-import android.support.annotation.Keep;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
+import androidx.annotation.Keep;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Checkable;
diff --git a/Settings/src/com/android/tv/settings/system/TimeZoneFragment.java b/Settings/src/com/android/tv/settings/system/TimeZoneFragment.java
index 760e9ca..f873ad3 100644
--- a/Settings/src/com/android/tv/settings/system/TimeZoneFragment.java
+++ b/Settings/src/com/android/tv/settings/system/TimeZoneFragment.java
@@ -23,10 +23,10 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.Keep;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
diff --git a/Settings/src/com/android/tv/settings/system/TtsEnginePreference.java b/Settings/src/com/android/tv/settings/system/TtsEnginePreference.java
index e0c7fba..2ea9736 100644
--- a/Settings/src/com/android/tv/settings/system/TtsEnginePreference.java
+++ b/Settings/src/com/android/tv/settings/system/TtsEnginePreference.java
@@ -20,8 +20,8 @@
import android.content.Context;
import android.content.DialogInterface;
import android.speech.tts.TextToSpeech;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
import android.util.Log;
import android.widget.Checkable;
import android.widget.RadioButton;
diff --git a/Settings/src/com/android/tv/settings/system/TtsEngineSettingsFragment.java b/Settings/src/com/android/tv/settings/system/TtsEngineSettingsFragment.java
index a19be31..55457bd 100644
--- a/Settings/src/com/android/tv/settings/system/TtsEngineSettingsFragment.java
+++ b/Settings/src/com/android/tv/settings/system/TtsEngineSettingsFragment.java
@@ -24,10 +24,10 @@
import android.os.Bundle;
import android.speech.tts.TextToSpeech;
import android.speech.tts.TtsEngines;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.NonNull;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.Log;
import android.util.Pair;
diff --git a/Settings/src/com/android/tv/settings/system/development/AdbDialog.java b/Settings/src/com/android/tv/settings/system/development/AdbDialog.java
index 3b50728..cd86eaa 100644
--- a/Settings/src/com/android/tv/settings/system/development/AdbDialog.java
+++ b/Settings/src/com/android/tv/settings/system/development/AdbDialog.java
@@ -18,11 +18,11 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/system/development/AdbKeysDialog.java b/Settings/src/com/android/tv/settings/system/development/AdbKeysDialog.java
index e07c7be..0f55d78 100644
--- a/Settings/src/com/android/tv/settings/system/development/AdbKeysDialog.java
+++ b/Settings/src/com/android/tv/settings/system/development/AdbKeysDialog.java
@@ -22,11 +22,11 @@
import android.os.IBinder;
import android.os.RemoteException;
import android.os.ServiceManager;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import android.util.Log;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/system/development/AppPicker.java b/Settings/src/com/android/tv/settings/system/development/AppPicker.java
index 076c07a..5ff5299 100644
--- a/Settings/src/com/android/tv/settings/system/development/AppPicker.java
+++ b/Settings/src/com/android/tv/settings/system/development/AppPicker.java
@@ -26,10 +26,10 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Process;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import android.text.TextUtils;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/system/development/CaptionCustomFragment.java b/Settings/src/com/android/tv/settings/system/development/CaptionCustomFragment.java
index 87b77c8..d6a9d8e 100644
--- a/Settings/src/com/android/tv/settings/system/development/CaptionCustomFragment.java
+++ b/Settings/src/com/android/tv/settings/system/development/CaptionCustomFragment.java
@@ -19,11 +19,11 @@
import android.content.res.TypedArray;
import android.os.Bundle;
import android.provider.Settings;
-import android.support.annotation.Keep;
-import android.support.v17.preference.LeanbackPreferenceFragment;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.annotation.Keep;
+import androidx.leanback.preference.LeanbackPreferenceFragment;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.TwoStatePreference;
import android.text.TextUtils;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/system/development/ColorModePreference.java b/Settings/src/com/android/tv/settings/system/development/ColorModePreference.java
index 1a060f5..3970eec 100644
--- a/Settings/src/com/android/tv/settings/system/development/ColorModePreference.java
+++ b/Settings/src/com/android/tv/settings/system/development/ColorModePreference.java
@@ -21,7 +21,7 @@
import android.hardware.display.DisplayManager.DisplayListener;
import android.os.Handler;
import android.os.Looper;
-import android.support.v14.preference.SwitchPreference;
+import androidx.preference.SwitchPreference;
import android.util.AttributeSet;
import android.view.Display;
diff --git a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
index 37ca52e..a25a08b 100644
--- a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
+++ b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
@@ -46,11 +46,11 @@
import android.os.UserManager;
import android.provider.Settings;
import android.service.persistentdata.PersistentDataBlockManager;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.Log;
import android.view.IWindowManager;
diff --git a/Settings/src/com/android/tv/settings/system/development/EnableDevelopmentDialog.java b/Settings/src/com/android/tv/settings/system/development/EnableDevelopmentDialog.java
index c59d143..e0e3e2d 100644
--- a/Settings/src/com/android/tv/settings/system/development/EnableDevelopmentDialog.java
+++ b/Settings/src/com/android/tv/settings/system/development/EnableDevelopmentDialog.java
@@ -18,11 +18,11 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/system/development/InactiveApps.java b/Settings/src/com/android/tv/settings/system/development/InactiveApps.java
index 5048b7c..ca449c4 100644
--- a/Settings/src/com/android/tv/settings/system/development/InactiveApps.java
+++ b/Settings/src/com/android/tv/settings/system/development/InactiveApps.java
@@ -22,9 +22,9 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.Keep;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/system/development/LogpersistPreferenceController.java b/Settings/src/com/android/tv/settings/system/development/LogpersistPreferenceController.java
index b620ee6..8e970cc 100644
--- a/Settings/src/com/android/tv/settings/system/development/LogpersistPreferenceController.java
+++ b/Settings/src/com/android/tv/settings/system/development/LogpersistPreferenceController.java
@@ -19,8 +19,8 @@
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.preference.Preference;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.development.AbstractLogpersistPreferenceController;
diff --git a/Settings/src/com/android/tv/settings/system/development/OemUnlockDialog.java b/Settings/src/com/android/tv/settings/system/development/OemUnlockDialog.java
index 6f8db8d..109526b 100644
--- a/Settings/src/com/android/tv/settings/system/development/OemUnlockDialog.java
+++ b/Settings/src/com/android/tv/settings/system/development/OemUnlockDialog.java
@@ -18,11 +18,11 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedAction;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedAction;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/users/AppRestrictionsFragment.java b/Settings/src/com/android/tv/settings/users/AppRestrictionsFragment.java
index ba44e54..e62dcbe 100644
--- a/Settings/src/com/android/tv/settings/users/AppRestrictionsFragment.java
+++ b/Settings/src/com/android/tv/settings/users/AppRestrictionsFragment.java
@@ -40,15 +40,15 @@
import android.os.RemoteException;
import android.os.UserHandle;
import android.os.UserManager;
-import android.support.annotation.NonNull;
-import android.support.v14.preference.MultiSelectListPreference;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v4.util.ArrayMap;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.annotation.NonNull;
+import androidx.preference.MultiSelectListPreference;
+import androidx.preference.SwitchPreference;
+import androidx.collection.ArrayMap;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
diff --git a/Settings/src/com/android/tv/settings/util/GuidedActionsAlignUtil.java b/Settings/src/com/android/tv/settings/util/GuidedActionsAlignUtil.java
index d694b77..4420734 100644
--- a/Settings/src/com/android/tv/settings/util/GuidedActionsAlignUtil.java
+++ b/Settings/src/com/android/tv/settings/util/GuidedActionsAlignUtil.java
@@ -16,14 +16,14 @@
package com.android.tv.settings.util;
-import android.support.v17.leanback.app.GuidedStepFragment;
-import android.support.v17.leanback.widget.BaseGridView;
-import android.support.v17.leanback.widget.FacetProvider;
-import android.support.v17.leanback.widget.GuidanceStylist;
-import android.support.v17.leanback.widget.GuidedActionsStylist;
-import android.support.v17.leanback.widget.ItemAlignmentFacet;
-import android.support.v17.leanback.widget.ItemAlignmentFacet.ItemAlignmentDef;
-import android.support.v17.leanback.widget.VerticalGridView;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.BaseGridView;
+import androidx.leanback.widget.FacetProvider;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.leanback.widget.ItemAlignmentFacet;
+import androidx.leanback.widget.ItemAlignmentFacet.ItemAlignmentDef;
+import androidx.leanback.widget.VerticalGridView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -56,7 +56,7 @@
ItemAlignmentFacet.ItemAlignmentDef alignedDef =
new ItemAlignmentFacet.ItemAlignmentDef();
alignedDef.setItemAlignmentViewId(
- android.support.v17.leanback.R.id.guidedactions_item_title);
+ androidx.leanback.R.id.guidedactions_item_title);
alignedDef.setAlignedToTextViewBaseline(false);
alignedDef.setItemAlignmentOffset(0);
alignedDef.setItemAlignmentOffsetWithPadding(true);
@@ -102,7 +102,7 @@
}
/**
- * Create a customized view for {@link android.support.v17.leanback.app.GuidedStepFragment} used
+ * Create a customized view for {@link androidx.leanback.app.GuidedStepFragment} used
* in device name setup.
*/
public static View createView(View view, GuidedStepFragment guidedStepFragment) {
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/MainFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/MainFragmentTest.java
index 4433f8e..dcb396d 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/MainFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/MainFragmentTest.java
@@ -31,9 +31,9 @@
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.service.settings.suggestions.Suggestion;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
import android.telephony.SignalStrength;
import com.android.settingslib.utils.IconCache;
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/PreferenceControllerFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/PreferenceControllerFragmentTest.java
index 46266cd..1d03b77 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/PreferenceControllerFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/PreferenceControllerFragmentTest.java
@@ -26,8 +26,8 @@
import static org.mockito.Mockito.verify;
import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/autofill/AutofillPickerFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/autofill/AutofillPickerFragmentTest.java
index 9fbe235..f94ea56 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/autofill/AutofillPickerFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/autofill/AutofillPickerFragmentTest.java
@@ -25,8 +25,8 @@
import android.os.UserManager;
import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.tv.settings.RadioPreference;
import com.android.tv.settings.TvSettingsRobolectricTestRunner;
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/AddPageBasedOnNetworkStateTest.java b/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/AddPageBasedOnNetworkStateTest.java
index dce7fb8..822a52f 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/AddPageBasedOnNetworkStateTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/AddPageBasedOnNetworkStateTest.java
@@ -22,7 +22,7 @@
import static org.mockito.Mockito.verify;
import static org.robolectric.shadow.api.Shadow.extract;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.content.Intent;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/AddStartStateTest.java b/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/AddStartStateTest.java
index 01bb698..d5c51cd 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/AddStartStateTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/AddStartStateTest.java
@@ -19,7 +19,7 @@
import static org.mockito.Mockito.verify;
import static org.robolectric.shadow.api.Shadow.extract;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.net.wifi.WifiConfiguration;
import com.android.settingslib.wifi.AccessPoint;
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/ConnectStateTest.java b/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/ConnectStateTest.java
index 728b887..f01b1cb 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/ConnectStateTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/ConnectStateTest.java
@@ -23,7 +23,7 @@
import static org.mockito.Mockito.verify;
import static org.robolectric.shadow.api.Shadow.extract;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.net.IpConfiguration;
import android.net.wifi.WifiConfiguration;
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/ConnectTimeoutStateTest.java b/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/ConnectTimeoutStateTest.java
index d36fe12..bf08157 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/ConnectTimeoutStateTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/ConnectTimeoutStateTest.java
@@ -19,7 +19,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
import android.net.wifi.WifiConfiguration;
import com.android.tv.settings.TvSettingsRobolectricTestRunner;
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/device/DevicePrefFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/device/DevicePrefFragmentTest.java
index 6e824ff..775c8f0 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/device/DevicePrefFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/device/DevicePrefFragmentTest.java
@@ -33,7 +33,7 @@
import android.content.pm.ResolveInfo;
import android.os.UserManager;
import android.provider.Settings;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.tv.settings.R;
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/device/apps/RecentAppsPreferenceControllerTest.java b/Settings/tests/robotests/src/com/android/tv/settings/device/apps/RecentAppsPreferenceControllerTest.java
index 5ffbc35..d0af27b 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/device/apps/RecentAppsPreferenceControllerTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/device/apps/RecentAppsPreferenceControllerTest.java
@@ -42,9 +42,9 @@
import android.content.pm.ResolveInfo;
import android.os.UserHandle;
import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/device/storage/SettingsStorageServiceTest.java b/Settings/tests/robotests/src/com/android/tv/settings/device/storage/SettingsStorageServiceTest.java
index 908f399..7574845 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/device/storage/SettingsStorageServiceTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/device/storage/SettingsStorageServiceTest.java
@@ -31,7 +31,7 @@
import android.os.storage.DiskInfo;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.text.TextUtils;
import org.junit.Before;
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/inputmethod/KeyboardFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/inputmethod/KeyboardFragmentTest.java
index 740776e..92472ab 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/inputmethod/KeyboardFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/inputmethod/KeyboardFragmentTest.java
@@ -24,10 +24,10 @@
import android.os.UserManager;
import android.provider.Settings;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
import com.android.tv.settings.R;
import com.android.tv.settings.TvSettingsRobolectricTestRunner;
