diff options
Diffstat (limited to 'src/com/android/settings/display')
20 files changed, 37 insertions, 37 deletions
diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java index 15eb8b3b2b..5caad6d59c 100644 --- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java @@ -21,8 +21,8 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; diff --git a/src/com/android/settings/display/AmbientDisplayPreferenceController.java b/src/com/android/settings/display/AmbientDisplayPreferenceController.java index 62223b0df9..f429b0dfe5 100644 --- a/src/com/android/settings/display/AmbientDisplayPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayPreferenceController.java @@ -17,7 +17,7 @@ package com.android.settings.display; import android.content.Context; import android.os.UserHandle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; diff --git a/src/com/android/settings/display/AppGridView.java b/src/com/android/settings/display/AppGridView.java index 4b814d0a5e..0027537528 100644 --- a/src/com/android/settings/display/AppGridView.java +++ b/src/com/android/settings/display/AppGridView.java @@ -22,7 +22,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; import android.os.UserHandle; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.util.IconDrawableFactory; import android.view.View; diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java index 596e2c6e3e..5241e641fa 100644 --- a/src/com/android/settings/display/AutoRotatePreferenceController.java +++ b/src/com/android/settings/display/AutoRotatePreferenceController.java @@ -14,7 +14,7 @@ package com.android.settings.display; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.view.RotationPolicy; diff --git a/src/com/android/settings/display/BatteryPercentagePreferenceController.java b/src/com/android/settings/display/BatteryPercentagePreferenceController.java index 449315873c..632e339070 100644 --- a/src/com/android/settings/display/BatteryPercentagePreferenceController.java +++ b/src/com/android/settings/display/BatteryPercentagePreferenceController.java @@ -17,8 +17,8 @@ package com.android.settings.display; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java index bbd6f8053f..e0aeda1ad5 100644 --- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java +++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java @@ -25,9 +25,9 @@ import android.os.ServiceManager; import android.provider.Settings; import android.provider.Settings.System; import android.service.vr.IVrManager; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.util.Log; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/CameraGesturePreferenceController.java b/src/com/android/settings/display/CameraGesturePreferenceController.java index d991302a56..9b1b2c296c 100644 --- a/src/com/android/settings/display/CameraGesturePreferenceController.java +++ b/src/com/android/settings/display/CameraGesturePreferenceController.java @@ -16,8 +16,8 @@ package com.android.settings.display; import android.content.Context; import android.os.SystemProperties; 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java index 9f947e9e97..f3873e2e2f 100644 --- a/src/com/android/settings/display/ColorModePreferenceFragment.java +++ b/src/com/android/settings/display/ColorModePreferenceFragment.java @@ -15,8 +15,8 @@ package com.android.settings.display; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.PreferenceScreen; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; import com.android.internal.app.ColorDisplayController; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/display/LiftToWakePreferenceController.java b/src/com/android/settings/display/LiftToWakePreferenceController.java index 7c2206b291..42feda2c96 100644 --- a/src/com/android/settings/display/LiftToWakePreferenceController.java +++ b/src/com/android/settings/display/LiftToWakePreferenceController.java @@ -17,8 +17,8 @@ import android.content.Context; import android.hardware.Sensor; import android.hardware.SensorManager; 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/display/NightDisplayPreference.java b/src/com/android/settings/display/NightDisplayPreference.java index ea39f75ced..09928878fd 100644 --- a/src/com/android/settings/display/NightDisplayPreference.java +++ b/src/com/android/settings/display/NightDisplayPreference.java @@ -15,7 +15,7 @@ package com.android.settings.display; import android.content.Context; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; import android.util.AttributeSet; import com.android.internal.app.ColorDisplayController; diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java index add4443f98..b2e6ba68f6 100644 --- a/src/com/android/settings/display/NightDisplaySettings.java +++ b/src/com/android/settings/display/NightDisplaySettings.java @@ -21,9 +21,9 @@ import android.app.TimePickerDialog; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; -import android.support.v7.preference.DropDownPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.TwoStatePreference; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; +import androidx.preference.TwoStatePreference; import com.android.internal.app.ColorDisplayController; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/display/NightModePreferenceController.java b/src/com/android/settings/display/NightModePreferenceController.java index 96ef938117..41620ea470 100644 --- a/src/com/android/settings/display/NightModePreferenceController.java +++ b/src/com/android/settings/display/NightModePreferenceController.java @@ -17,9 +17,9 @@ import static android.content.Context.UI_MODE_SERVICE; import android.app.UiModeManager; import android.content.Context; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.util.Log; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/ScreenSaverPreferenceController.java b/src/com/android/settings/display/ScreenSaverPreferenceController.java index 6866f39687..ae44bf3e18 100644 --- a/src/com/android/settings/display/ScreenSaverPreferenceController.java +++ b/src/com/android/settings/display/ScreenSaverPreferenceController.java @@ -14,7 +14,7 @@ package com.android.settings.display; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.dream.DreamSettings; diff --git a/src/com/android/settings/display/ScreenZoomPreference.java b/src/com/android/settings/display/ScreenZoomPreference.java index 9fe082dc68..8451a2d4e3 100644 --- a/src/com/android/settings/display/ScreenZoomPreference.java +++ b/src/com/android/settings/display/ScreenZoomPreference.java @@ -17,8 +17,8 @@ package com.android.settings.display; import android.content.Context; -import android.support.v4.content.res.TypedArrayUtils; -import android.support.v7.preference.Preference; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; import android.text.TextUtils; import android.util.AttributeSet; @@ -31,7 +31,7 @@ import com.android.settingslib.display.DisplayDensityUtils; public class ScreenZoomPreference extends Preference { public ScreenZoomPreference(Context context, AttributeSet attrs) { super(context, attrs, TypedArrayUtils.getAttr(context, - android.support.v7.preference.R.attr.preferenceStyle, + androidx.preference.R.attr.preferenceStyle, android.R.attr.preferenceStyle)); final DisplayDensityUtils density = new DisplayDensityUtils(context); diff --git a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java index 4573c6d0ad..cdb89fb4e1 100644 --- a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java +++ b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java @@ -15,8 +15,8 @@ package com.android.settings.display; import android.content.Context; 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 com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/TapToWakePreferenceController.java b/src/com/android/settings/display/TapToWakePreferenceController.java index c5a387d2a2..ff149ba838 100644 --- a/src/com/android/settings/display/TapToWakePreferenceController.java +++ b/src/com/android/settings/display/TapToWakePreferenceController.java @@ -15,8 +15,8 @@ package com.android.settings.display; import android.content.Context; 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java index 1bc49b625d..2cdf7e21c3 100644 --- a/src/com/android/settings/display/ThemePreferenceController.java +++ b/src/com/android/settings/display/ThemePreferenceController.java @@ -20,9 +20,9 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; import android.text.TextUtils; import com.android.settings.R; diff --git a/src/com/android/settings/display/TimeoutPreferenceController.java b/src/com/android/settings/display/TimeoutPreferenceController.java index 07146f9a1d..b2a638ecde 100644 --- a/src/com/android/settings/display/TimeoutPreferenceController.java +++ b/src/com/android/settings/display/TimeoutPreferenceController.java @@ -20,7 +20,7 @@ import android.content.Context; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import android.util.Log; import com.android.settings.R; diff --git a/src/com/android/settings/display/VrDisplayPreferenceController.java b/src/com/android/settings/display/VrDisplayPreferenceController.java index 7fdb19f2db..9ff2861dae 100644 --- a/src/com/android/settings/display/VrDisplayPreferenceController.java +++ b/src/com/android/settings/display/VrDisplayPreferenceController.java @@ -17,7 +17,7 @@ import android.app.ActivityManager; import android.content.Context; import android.content.pm.PackageManager; import android.provider.Settings; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java index 9410b5a019..3c0e9476d8 100644 --- a/src/com/android/settings/display/WallpaperPreferenceController.java +++ b/src/com/android/settings/display/WallpaperPreferenceController.java @@ -19,7 +19,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserHandle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; |