diff options
| author | 2023-10-23 12:38:18 +0800 | |
|---|---|---|
| committer | 2023-10-23 09:28:57 +0000 | |
| commit | 15ca95a31b51682f868e486e9f07c64d785c3f4b (patch) | |
| tree | ab7b79bb8d398f57cc027d57544b2da919f51638 | |
| parent | 7976f1e76d6b126d4a4f5f8c85817b6fae7d1beb (diff) | |
Migrate to TwoStatePreference
SwitchPreference and SwitchPreferenceCompat are both TwoStatePreference.
Using TwoStatePreference in Java will helps migration in the future.
Bug: 306771414
Test: manual - check Settings pages
Change-Id: I84e1d7b09451106797c2b23d127855c6976678ca
141 files changed, 391 insertions, 395 deletions
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java index 6592fe0d787..4628221c323 100644 --- a/src/com/android/settings/IccLockSettings.java +++ b/src/com/android/settings/IccLockSettings.java @@ -53,7 +53,7 @@ import android.widget.TextView; import android.widget.Toast; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.network.ProxySubscriptionManager; import com.android.settings.network.SubscriptionUtil; @@ -122,7 +122,7 @@ public class IccLockSettings extends SettingsPreferenceFragment private ProxySubscriptionManager mProxySubscriptionMgr; private EditPinPreference mPinDialog; - private SwitchPreference mPinToggle; + private TwoStatePreference mPinToggle; private Resources mRes; @@ -193,7 +193,7 @@ public class IccLockSettings extends SettingsPreferenceFragment addPreferencesFromResource(R.xml.sim_lock_settings); mPinDialog = (EditPinPreference) findPreference(PIN_DIALOG); - mPinToggle = (SwitchPreference) findPreference(PIN_TOGGLE); + mPinToggle = (TwoStatePreference) findPreference(PIN_TOGGLE); if (savedInstanceState != null) { if (savedInstanceState.containsKey(DIALOG_STATE) && restoreDialogStates(savedInstanceState)) { diff --git a/src/com/android/settings/accessibility/ColorAndMotionFragment.java b/src/com/android/settings/accessibility/ColorAndMotionFragment.java index 9116642f46a..7933eb15527 100644 --- a/src/com/android/settings/accessibility/ColorAndMotionFragment.java +++ b/src/com/android/settings/accessibility/ColorAndMotionFragment.java @@ -24,7 +24,7 @@ import android.provider.Settings; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -49,8 +49,8 @@ public class ColorAndMotionFragment extends DashboardFragment { private static final String TOGGLE_LARGE_POINTER_ICON = "toggle_large_pointer_icon"; private Preference mDisplayDaltonizerPreferenceScreen; - private SwitchPreference mToggleDisableAnimationsPreference; - private SwitchPreference mToggleLargePointerIconPreference; + private TwoStatePreference mToggleDisableAnimationsPreference; + private TwoStatePreference mToggleLargePointerIconPreference; private AccessibilitySettingsContentObserver mSettingsContentObserver; private final List<String> mShortcutFeatureKeys = new ArrayList<>(); diff --git a/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java b/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java index 2ec1d70da70..2333ed38f25 100644 --- a/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java +++ b/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java @@ -26,7 +26,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; @@ -62,7 +62,7 @@ public class DisableAnimationsPreferenceController extends TogglePreferenceContr }; private final ContentResolver mContentResolver; - private SwitchPreference mPreference; + private TwoStatePreference mPreference; public DisableAnimationsPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); diff --git a/src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java b/src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java index dd419d0a6e5..3d36aa4721f 100644 --- a/src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java +++ b/src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java @@ -26,7 +26,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; @@ -45,7 +45,7 @@ public class FloatingMenuFadePreferenceController extends BasePreferenceControll final ContentObserver mContentObserver; @VisibleForTesting - SwitchPreference mPreference; + TwoStatePreference mPreference; public FloatingMenuFadePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); @@ -81,7 +81,7 @@ public class FloatingMenuFadePreferenceController extends BasePreferenceControll @Override public void updateState(Preference preference) { super.updateState(preference); - final SwitchPreference switchPreference = (SwitchPreference) preference; + final TwoStatePreference switchPreference = (TwoStatePreference) preference; switchPreference.setChecked(getFloatingMenuFadeValue() == ON); } diff --git a/src/com/android/settings/accessibility/HighTextContrastPreferenceController.java b/src/com/android/settings/accessibility/HighTextContrastPreferenceController.java index 9f645f1fa24..7a3f4f6e912 100644 --- a/src/com/android/settings/accessibility/HighTextContrastPreferenceController.java +++ b/src/com/android/settings/accessibility/HighTextContrastPreferenceController.java @@ -20,7 +20,7 @@ import android.content.Context; import android.provider.Settings; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.accessibility.TextReadingPreferenceFragment.EntryPoint; @@ -32,7 +32,7 @@ import com.android.settings.core.instrumentation.SettingsStatsLog; */ public class HighTextContrastPreferenceController extends TogglePreferenceController implements TextReadingResetController.ResetStateListener { - private SwitchPreference mSwitchPreference; + private TwoStatePreference mSwitchPreference; @EntryPoint private int mEntryPoint; diff --git a/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java b/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java index 29d5928e1cb..47c2a957d7b 100644 --- a/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java +++ b/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java @@ -37,7 +37,7 @@ import androidx.lifecycle.DefaultLifecycleObserver; import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; @@ -59,7 +59,7 @@ public class KeyboardVibrationTogglePreferenceController extends TogglePreferenc private final Vibrator mVibrator; @Nullable - private SwitchPreference mPreference; + private TwoStatePreference mPreference; public KeyboardVibrationTogglePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); diff --git a/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceController.java b/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceController.java index b0a6abc8349..e455aa87695 100644 --- a/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceController.java @@ -26,7 +26,7 @@ import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; @@ -43,7 +43,7 @@ public class MagnificationAlwaysOnPreferenceController extends TogglePreferenceC MagnificationAlwaysOnPreferenceController.class.getSimpleName(); static final String PREF_KEY = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED; - private SwitchPreference mSwitchPreference; + private TwoStatePreference mSwitchPreference; public MagnificationAlwaysOnPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); diff --git a/src/com/android/settings/accessibility/MagnificationFollowTypingPreferenceController.java b/src/com/android/settings/accessibility/MagnificationFollowTypingPreferenceController.java index a758276afbe..86983e3c06d 100644 --- a/src/com/android/settings/accessibility/MagnificationFollowTypingPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationFollowTypingPreferenceController.java @@ -26,7 +26,7 @@ import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; @@ -39,7 +39,7 @@ public class MagnificationFollowTypingPreferenceController extends TogglePrefere MagnificationFollowTypingPreferenceController.class.getSimpleName(); static final String PREF_KEY = "magnification_follow_typing"; - private SwitchPreference mFollowTypingPreference; + private TwoStatePreference mFollowTypingPreference; public MagnificationFollowTypingPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); diff --git a/src/com/android/settings/accessibility/MagnificationJoystickPreferenceController.java b/src/com/android/settings/accessibility/MagnificationJoystickPreferenceController.java index bc9e093ffc9..0a24e96f6e3 100644 --- a/src/com/android/settings/accessibility/MagnificationJoystickPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationJoystickPreferenceController.java @@ -26,7 +26,7 @@ import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; @@ -41,7 +41,7 @@ public class MagnificationJoystickPreferenceController extends TogglePreferenceC MagnificationJoystickPreferenceController.class.getSimpleName(); static final String PREF_KEY = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED; - private SwitchPreference mSwitchPreference; + private TwoStatePreference mSwitchPreference; public MagnificationJoystickPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); diff --git a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java index 16f9957d1c5..2f7005cbc6c 100644 --- a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java @@ -33,7 +33,7 @@ import android.view.View; import android.view.ViewGroup; import androidx.preference.PreferenceCategory; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType; @@ -102,7 +102,7 @@ public class ToggleReduceBrightColorsPreferenceFragment extends ToggleFeaturePre getPreferenceScreen().removePreference(intensity); intensity.setOrder(mShortcutPreference.getOrder() - 2); generalCategory.addPreference(intensity); - final SwitchPreference persist = findPreference(KEY_PERSIST); + final TwoStatePreference persist = findPreference(KEY_PERSIST); getPreferenceScreen().removePreference(persist); persist.setOrder(mShortcutPreference.getOrder() - 1); generalCategory.addPreference(persist); diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java index d0b743dd189..b81c7192a22 100644 --- a/src/com/android/settings/applications/UsageAccessDetails.java +++ b/src/com/android/settings/applications/UsageAccessDetails.java @@ -38,7 +38,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.applications.AppStateUsageBridge.UsageState; @@ -57,7 +57,7 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc // TODO: Break out this functionality into its own class. private AppStateUsageBridge mUsageBridge; private AppOpsManager mAppOpsManager; - private SwitchPreference mSwitchPref; + private TwoStatePreference mSwitchPref; private Preference mUsageDesc; private Intent mSettingsIntent; private UsageState mUsageState; @@ -78,7 +78,7 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc mDpm = context.getSystemService(DevicePolicyManager.class); addPreferencesFromResource(R.xml.app_ops_permissions_details); - mSwitchPref = (SwitchPreference) findPreference(KEY_APP_OPS_SETTINGS_SWITCH); + mSwitchPref = (TwoStatePreference) findPreference(KEY_APP_OPS_SETTINGS_SWITCH); mUsageDesc = findPreference(KEY_APP_OPS_SETTINGS_DESC); getPreferenceScreen().setTitle(R.string.usage_access); diff --git a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java index e1e5968bc0b..409b695f312 100644 --- a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java +++ b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java @@ -23,12 +23,13 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.Utils; @@ -50,7 +51,8 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc // TODO: Break out this functionality into its own class. private AppStateOverlayBridge mOverlayBridge; private AppOpsManager mAppOpsManager; - private SwitchPreference mSwitchPref; + @Nullable + private TwoStatePreference mSwitchPref = null; private OverlayState mOverlayState; @Override diff --git a/src/com/android/settings/applications/appinfo/HibernationSwitchPreferenceController.java b/src/com/android/settings/applications/appinfo/HibernationSwitchPreferenceController.java index e3c577b189e..12703dd6d62 100644 --- a/src/com/android/settings/applications/appinfo/HibernationSwitchPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/HibernationSwitchPreferenceController.java @@ -37,7 +37,7 @@ import android.util.Slog; import androidx.annotation.NonNull; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.google.common.annotations.VisibleForTesting; @@ -107,7 +107,7 @@ public final class HibernationSwitchPreferenceController extends AppInfoPreferen @Override public void updateState(Preference preference) { super.updateState(preference); - ((SwitchPreference) preference).setChecked(isAppEligibleForHibernation() + ((TwoStatePreference) preference).setChecked(isAppEligibleForHibernation() && !isPackageHibernationExemptByUser()); preference.setEnabled(isAppEligibleForHibernation()); if (!mHibernationEligibilityLoaded) { diff --git a/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java b/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java index 4253bd98146..e7eff9fc377 100644 --- a/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java +++ b/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java @@ -27,7 +27,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; @@ -47,7 +47,7 @@ public class ManageExternalStorageDetails extends AppInfoWithHeader implements private AppStateManageExternalStorageBridge mBridge; private AppOpsManager mAppOpsManager; - private SwitchPreference mSwitchPref; + private TwoStatePreference mSwitchPref; private PermissionState mPermissionState; private MetricsFeatureProvider mMetricsFeatureProvider; diff --git a/src/com/android/settings/applications/appinfo/MediaManagementAppsDetails.java b/src/com/android/settings/applications/appinfo/MediaManagementAppsDetails.java index f60fb4fdaa0..71b494b7631 100644 --- a/src/com/android/settings/applications/appinfo/MediaManagementAppsDetails.java +++ b/src/com/android/settings/applications/appinfo/MediaManagementAppsDetails.java @@ -23,7 +23,7 @@ import android.os.Bundle; import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; @@ -41,7 +41,7 @@ public class MediaManagementAppsDetails extends AppInfoWithHeader implements private AppStateMediaManagementAppsBridge mAppBridge; private AppOpsManager mAppOpsManager; - private SwitchPreference mSwitchPref; + private TwoStatePreference mSwitchPref; private PermissionState mPermissionState; @Override diff --git a/src/com/android/settings/applications/appinfo/TurnScreenOnDetails.java b/src/com/android/settings/applications/appinfo/TurnScreenOnDetails.java index 39e1a5fa2ad..95694db5a79 100644 --- a/src/com/android/settings/applications/appinfo/TurnScreenOnDetails.java +++ b/src/com/android/settings/applications/appinfo/TurnScreenOnDetails.java @@ -28,7 +28,7 @@ import android.os.Bundle; import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.Settings; @@ -46,7 +46,7 @@ public class TurnScreenOnDetails extends AppInfoWithHeader implements OnPreferen private AppStateTurnScreenOnBridge mAppBridge; private AppOpsManager mAppOpsManager; - private SwitchPreference mSwitchPref; + private TwoStatePreference mSwitchPref; private AppStateAppOpsBridge.PermissionState mPermissionState; @@ -60,7 +60,7 @@ public class TurnScreenOnDetails extends AppInfoWithHeader implements OnPreferen // find preferences addPreferencesFromResource(R.xml.turn_screen_on_permissions_details); - mSwitchPref = (SwitchPreference) findPreference(KEY_APP_OPS_SETTINGS_SWITCH); + mSwitchPref = (TwoStatePreference) findPreference(KEY_APP_OPS_SETTINGS_SWITCH); mSwitchPref.setOnPreferenceChangeListener(this); } diff --git a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java index 476cd4e4995..94ebc41f06c 100644 --- a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java +++ b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java @@ -24,7 +24,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; @@ -43,7 +43,7 @@ public class WriteSettingsDetails extends AppInfoWithHeader implements OnPrefere // TODO: Break out this functionality into its own class. private AppStateWriteSettingsBridge mAppBridge; private AppOpsManager mAppOpsManager; - private SwitchPreference mSwitchPref; + private TwoStatePreference mSwitchPref; private WriteSettingsState mWriteSettingsState; @Override diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java index 7d557bec28b..d166b82f435 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java @@ -28,7 +28,7 @@ import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; @@ -41,7 +41,7 @@ public class PictureInPictureDetails extends AppInfoWithHeader private static final String KEY_APP_OPS_SETTINGS_SWITCH = "app_ops_settings_switch"; private static final String LOG_TAG = "PictureInPictureDetails"; - private SwitchPreference mSwitchPref; + private TwoStatePreference mSwitchPref; @Override public void onCreate(Bundle savedInstanceState) { @@ -49,7 +49,7 @@ public class PictureInPictureDetails extends AppInfoWithHeader // find preferences addPreferencesFromResource(R.xml.picture_in_picture_permissions_details); - mSwitchPref = (SwitchPreference) findPreference(KEY_APP_OPS_SETTINGS_SWITCH); + mSwitchPref = (TwoStatePreference) findPreference(KEY_APP_OPS_SETTINGS_SWITCH); // set title/summary for all of them mSwitchPref.setTitle(R.string.picture_in_picture_app_detail_switch); diff --git a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java index 0a326c6629b..ffe13e6f5a0 100644 --- a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java +++ b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java @@ -16,13 +16,12 @@ package com.android.settings.applications.specialaccess.zenaccess; -import android.app.ActivityManager; import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import androidx.appcompat.app.AlertDialog; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; @@ -66,7 +65,7 @@ public class ZenAccessDetails extends AppInfoWithHeader implements return null; } - public void updatePreference(Context context, SwitchPreference preference) { + private void updatePreference(Context context, TwoStatePreference preference) { final CharSequence label = mPackageInfo.applicationInfo.loadLabel(mPm); final Set<String> autoApproved = ZenAccessController.getAutoApprovedPackages(context); if (autoApproved.contains(mPackageName)) { diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java index 82fa00b864e..b5e99083a5f 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java @@ -23,7 +23,7 @@ import android.hardware.face.FaceManager.SetFeatureCallback; import android.provider.Settings; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.Utils; @@ -37,7 +37,7 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe private byte[] mToken; private FaceManager mFaceManager; - private SwitchPreference mPreference; + private TwoStatePreference mPreference; private final SetFeatureCallback mSetFeatureCallback = new SetFeatureCallback() { @Override diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java index e5d9dd8019c..2185ed5c15d 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java @@ -60,7 +60,7 @@ import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; @@ -615,7 +615,7 @@ public class FingerprintSettings extends SubSettings { mRequireScreenOnToAuthPreferenceController.isChecked()); mRequireScreenOnToAuthPreference.setOnPreferenceChangeListener( (preference, newValue) -> { - final boolean isChecked = ((SwitchPreference) preference).isChecked(); + final boolean isChecked = ((TwoStatePreference) preference).isChecked(); mRequireScreenOnToAuthPreferenceController.setChecked(!isChecked); return true; }); diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java index 3345a55e59d..8214d0b06be 100644 --- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java @@ -55,7 +55,7 @@ import android.widget.Toast; import androidx.annotation.VisibleForTesting; import androidx.fragment.app.FragmentActivity; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -376,16 +376,16 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { } private void setSwitchChecked(Preference pref, boolean checked) { - if (pref instanceof PrimarySwitchPreference) { - ((PrimarySwitchPreference) pref).setChecked(checked); - } else if (pref instanceof SwitchPreference) { - ((SwitchPreference) pref).setChecked(checked); + if (pref instanceof PrimarySwitchPreference primarySwitchPreference) { + primarySwitchPreference.setChecked(checked); + } else if (pref instanceof TwoStatePreference twoStatePreference) { + twoStatePreference.setChecked(checked); } } private void setSwitchEnabled(Preference pref, boolean enabled) { - if (pref instanceof PrimarySwitchPreference) { - ((PrimarySwitchPreference) pref).setSwitchEnabled(enabled); + if (pref instanceof PrimarySwitchPreference primarySwitchPreference) { + primarySwitchPreference.setSwitchEnabled(enabled); } else { pref.setEnabled(enabled); } diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java index 0c07c19123c..9a7411a7347 100644 --- a/src/com/android/settings/datausage/BillingCycleSettings.java +++ b/src/com/android/settings/datausage/BillingCycleSettings.java @@ -40,7 +40,7 @@ import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -83,8 +83,8 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements NetworkTemplate mNetworkTemplate; private Preference mBillingCycle; private Preference mDataWarning; - private SwitchPreference mEnableDataWarning; - private SwitchPreference mEnableDataLimit; + private TwoStatePreference mEnableDataWarning; + private TwoStatePreference mEnableDataLimit; private Preference mDataLimit; private DataUsageController mDataUsageController; @@ -93,8 +93,8 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements Preference billingCycle, Preference dataLimit, Preference dataWarning, - SwitchPreference enableLimit, - SwitchPreference enableWarning) { + TwoStatePreference enableLimit, + TwoStatePreference enableWarning) { services.mPolicyEditor = policyEditor; mBillingCycle = billingCycle; mDataLimit = dataLimit; @@ -133,10 +133,10 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements } mBillingCycle = findPreference(KEY_BILLING_CYCLE); - mEnableDataWarning = (SwitchPreference) findPreference(KEY_SET_DATA_WARNING); + mEnableDataWarning = (TwoStatePreference) findPreference(KEY_SET_DATA_WARNING); mEnableDataWarning.setOnPreferenceChangeListener(this); mDataWarning = findPreference(KEY_DATA_WARNING); - mEnableDataLimit = (SwitchPreference) findPreference(KEY_SET_DATA_LIMIT); + mEnableDataLimit = (TwoStatePreference) findPreference(KEY_SET_DATA_LIMIT); mEnableDataLimit.setOnPreferenceChangeListener(this); mDataLimit = findPreference(KEY_DATA_LIMIT); } diff --git a/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java index 7b7e0640666..59f7f725c71 100644 --- a/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java @@ -23,7 +23,6 @@ import android.text.TextUtils; import android.text.format.DateFormat; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; @@ -52,10 +51,10 @@ public class AutoTimeFormatPreferenceController extends AbstractPreferenceContro @Override public void updateState(Preference preference) { - if (!(preference instanceof SwitchPreference)) { + if (!(preference instanceof TwoStatePreference)) { return; } - ((SwitchPreference) preference).setChecked(isAutoTimeFormatSelection(mContext)); + ((TwoStatePreference) preference).setChecked(isAutoTimeFormatSelection(mContext)); } @Override @@ -64,7 +63,7 @@ public class AutoTimeFormatPreferenceController extends AbstractPreferenceContro || !TextUtils.equals(KEY_AUTO_24_HOUR, preference.getKey())) { return false; } - boolean auto24HourEnabled = ((SwitchPreference) preference).isChecked(); + boolean auto24HourEnabled = ((TwoStatePreference) preference).isChecked(); Boolean is24Hour; if (auto24HourEnabled) { is24Hour = null; diff --git a/src/com/android/settings/datetime/AutoTimePreferenceController.java b/src/com/android/settings/datetime/AutoTimePreferenceController.java index 2b158e08a3d..ca1d4ae263e 100644 --- a/src/com/android/settings/datetime/AutoTimePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimePreferenceController.java @@ -28,7 +28,7 @@ import android.app.time.TimeManager; import android.content.Context; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.core.PreferenceControllerMixin; @@ -77,11 +77,11 @@ public class AutoTimePreferenceController extends AbstractPreferenceController @Override public void updateState(Preference preference) { - if (!(preference instanceof SwitchPreference)) { + if (!(preference instanceof TwoStatePreference)) { return; } - ((SwitchPreference) preference).setChecked(isEnabled()); + ((TwoStatePreference) preference).setChecked(isEnabled()); } @Override diff --git a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java index 7d1c1b65a27..c821ad4a7f4 100644 --- a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java @@ -29,7 +29,7 @@ import android.content.Context; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; @@ -92,11 +92,11 @@ public class AutoTimeZonePreferenceController extends AbstractPreferenceControll @Override public void updateState(Preference preference) { - if (!(preference instanceof SwitchPreference)) { + if (!(preference instanceof TwoStatePreference)) { return; } - ((SwitchPreference) preference).setChecked(isEnabled()); + ((TwoStatePreference) preference).setChecked(isEnabled()); } @Override diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java index 900ec7aa710..2d2e0a53025 100644 --- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java +++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java @@ -23,7 +23,6 @@ import android.text.TextUtils; import android.text.format.DateFormat; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; @@ -82,7 +81,7 @@ public class TimeFormatPreferenceController extends AbstractPreferenceController || !TextUtils.equals(KEY_TIME_FORMAT, preference.getKey())) { return false; } - final boolean is24Hour = ((SwitchPreference) preference).isChecked(); + final boolean is24Hour = ((TwoStatePreference) preference).isChecked(); update24HourFormat(mContext, is24Hour); mUpdateTimeAndDateCallback.updateTimeAndDateDisplay(mContext); return true; diff --git a/src/com/android/settings/development/AdbAuthorizationTimeoutPreferenceController.java b/src/com/android/settings/development/AdbAuthorizationTimeoutPreferenceController.java index 79aa8e60d8c..c2ae189bd8f 100644 --- a/src/com/android/settings/development/AdbAuthorizationTimeoutPreferenceController.java +++ b/src/com/android/settings/development/AdbAuthorizationTimeoutPreferenceController.java @@ -20,7 +20,7 @@ import android.content.Context; import android.provider.Settings; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -51,7 +51,7 @@ public class AdbAuthorizationTimeoutPreferenceController extends Settings.Global.DEFAULT_ADB_ALLOWED_CONNECTION_TIME); // An authTimeout of 0 indicates this preference is enabled and adb authorizations will not // be automatically revoked. - ((SwitchPreference) mPreference).setChecked(authTimeout == 0); + ((TwoStatePreference) mPreference).setChecked(authTimeout == 0); } @Override @@ -64,7 +64,7 @@ public class AdbAuthorizationTimeoutPreferenceController extends public void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); writeSetting(false); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } private void writeSetting(boolean isEnabled) { diff --git a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java index 14474f29785..cc8651344f5 100644 --- a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java +++ b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java @@ -21,7 +21,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -59,7 +59,7 @@ public class AllowAppsOnExternalPreferenceController extends DeveloperOptionsPre final int mode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.FORCE_ALLOW_ON_EXTERNAL, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); } @Override @@ -67,6 +67,6 @@ public class AllowAppsOnExternalPreferenceController extends DeveloperOptionsPre super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.FORCE_ALLOW_ON_EXTERNAL, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java index 15e26633439..3ce28709a08 100644 --- a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java +++ b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java @@ -20,7 +20,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -57,7 +57,7 @@ public class AppsNotRespondingPreferenceController extends DeveloperOptionsPrefe public void updateState(Preference preference) { final int mode = Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); } @Override @@ -65,6 +65,6 @@ public class AppsNotRespondingPreferenceController extends DeveloperOptionsPrefe super.onDeveloperOptionsSwitchDisabled(); Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/ArtVerifierPreferenceController.java b/src/com/android/settings/development/ArtVerifierPreferenceController.java index 4b2f030bcdc..0f479203b00 100644 --- a/src/com/android/settings/development/ArtVerifierPreferenceController.java +++ b/src/com/android/settings/development/ArtVerifierPreferenceController.java @@ -21,7 +21,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -59,7 +59,7 @@ public class ArtVerifierPreferenceController extends DeveloperOptionsPreferenceC final int verifyDebuggable = Settings.Global.getInt( mContext.getContentResolver(), Settings.Global.ART_VERIFIER_VERIFY_DEBUGGABLE, SETTING_VALUE_ON); - ((SwitchPreference) mPreference).setChecked(verifyDebuggable != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(verifyDebuggable != SETTING_VALUE_OFF); } @Override @@ -67,6 +67,6 @@ public class ArtVerifierPreferenceController extends DeveloperOptionsPreferenceC super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.ART_VERIFIER_VERIFY_DEBUGGABLE, SETTING_VALUE_ON); - ((SwitchPreference) mPreference).setChecked(true); + ((TwoStatePreference) mPreference).setChecked(true); } } diff --git a/src/com/android/settings/development/AutomaticSystemServerHeapDumpPreferenceController.java b/src/com/android/settings/development/AutomaticSystemServerHeapDumpPreferenceController.java index aa76bb8f14a..05a5dc90b4c 100644 --- a/src/com/android/settings/development/AutomaticSystemServerHeapDumpPreferenceController.java +++ b/src/com/android/settings/development/AutomaticSystemServerHeapDumpPreferenceController.java @@ -22,7 +22,7 @@ import android.os.UserManager; import android.provider.Settings; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -71,7 +71,7 @@ public class AutomaticSystemServerHeapDumpPreferenceController extends public void updateState(Preference preference) { final int mode = Settings.Secure.getInt(mContext.getContentResolver(), Settings.Global.ENABLE_AUTOMATIC_SYSTEM_SERVER_HEAP_DUMPS, SETTING_VALUE_ON); - ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); } @Override @@ -79,6 +79,6 @@ public class AutomaticSystemServerHeapDumpPreferenceController extends super.onDeveloperOptionsSwitchDisabled(); Settings.Secure.putInt(mContext.getContentResolver(), Settings.Global.ENABLE_AUTOMATIC_SYSTEM_SERVER_HEAP_DUMPS, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/BackAnimationPreferenceController.java b/src/com/android/settings/development/BackAnimationPreferenceController.java index 003b1f92850..aa4faf5c25f 100644 --- a/src/com/android/settings/development/BackAnimationPreferenceController.java +++ b/src/com/android/settings/development/BackAnimationPreferenceController.java @@ -20,7 +20,7 @@ import android.content.Context; import android.provider.Settings; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.core.PreferenceControllerMixin; @@ -76,7 +76,7 @@ public class BackAnimationPreferenceController extends DeveloperOptionsPreferenc public void updateState(Preference preference) { final int mode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.ENABLE_BACK_ANIMATION, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); } @Override @@ -84,6 +84,6 @@ public class BackAnimationPreferenceController extends DeveloperOptionsPreferenc super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.ENABLE_BACK_ANIMATION, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java index e47048af6f4..b43303befc9 100644 --- a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java +++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java @@ -23,7 +23,7 @@ import android.os.SystemProperties; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -66,10 +66,10 @@ public class BluetoothA2dpHwOffloadPreferenceController extends DeveloperOptions if (offloadSupported) { final boolean offloadDisabled = SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false); - ((SwitchPreference) mPreference).setChecked(offloadDisabled); + ((TwoStatePreference) mPreference).setChecked(offloadDisabled); } else { mPreference.setEnabled(false); - ((SwitchPreference) mPreference).setChecked(true); + ((TwoStatePreference) mPreference).setChecked(true); } } @@ -79,7 +79,7 @@ public class BluetoothA2dpHwOffloadPreferenceController extends DeveloperOptions final boolean offloadSupported = SystemProperties.getBoolean(A2DP_OFFLOAD_SUPPORTED_PROPERTY, false); if (offloadSupported) { - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, "false"); } } diff --git a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java index 77f0f507f8e..1e5a7ca7583 100644 --- a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java +++ b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java @@ -21,7 +21,7 @@ import android.os.SystemProperties; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -57,13 +57,13 @@ public class BluetoothAbsoluteVolumePreferenceController extends public void updateState(Preference preference) { final boolean isEnabled = SystemProperties.getBoolean( BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, false /* default */); - ((SwitchPreference) mPreference).setChecked(isEnabled); + ((TwoStatePreference) mPreference).setChecked(isEnabled); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); SystemProperties.set(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, "false"); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java index 849e981981b..c306aca50ac 100644 --- a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java +++ b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java @@ -21,7 +21,7 @@ import android.os.SystemProperties; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -57,13 +57,13 @@ public class BluetoothDeviceNoNamePreferenceController extends public void updateState(Preference preference) { final boolean isEnabled = SystemProperties.getBoolean( BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */); - ((SwitchPreference) mPreference).setChecked(isEnabled); + ((TwoStatePreference) mPreference).setChecked(isEnabled); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); SystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, "false"); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/BluetoothLeAudioAllowListPreferenceController.java b/src/com/android/settings/development/BluetoothLeAudioAllowListPreferenceController.java index cc43c2becc2..51533e7d47e 100644 --- a/src/com/android/settings/development/BluetoothLeAudioAllowListPreferenceController.java +++ b/src/com/android/settings/development/BluetoothLeAudioAllowListPreferenceController.java @@ -25,7 +25,7 @@ import android.sysprop.BluetoothProperties; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -90,14 +90,14 @@ public class BluetoothLeAudioAllowListPreferenceController (mBluetoothAdapter.isLeAudioSupported() == BluetoothStatusCodes.FEATURE_SUPPORTED); if (!isLeAudioSupported) { mPreference.setEnabled(false); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); return; } mPreference.setEnabled(true); final boolean isLeAudioAllowlistBypassed = SystemProperties.getBoolean(BYPASS_LE_AUDIO_ALLOWLIST_PROPERTY, false); - ((SwitchPreference) mPreference).setChecked(isLeAudioAllowlistBypassed); + ((TwoStatePreference) mPreference).setChecked(isLeAudioAllowlistBypassed); } @Override @@ -107,7 +107,7 @@ public class BluetoothLeAudioAllowListPreferenceController SystemProperties.getBoolean(BYPASS_LE_AUDIO_ALLOWLIST_PROPERTY, false); if (isBypassed) { SystemProperties.set(BYPASS_LE_AUDIO_ALLOWLIST_PROPERTY, Boolean.toString(false)); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } } diff --git a/src/com/android/settings/development/BluetoothLeAudioDeviceDetailsPreferenceController.java b/src/com/android/settings/development/BluetoothLeAudioDeviceDetailsPreferenceController.java index 16d8b327854..0a829900a41 100644 --- a/src/com/android/settings/development/BluetoothLeAudioDeviceDetailsPreferenceController.java +++ b/src/com/android/settings/development/BluetoothLeAudioDeviceDetailsPreferenceController.java @@ -24,7 +24,7 @@ import android.os.SystemProperties; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -93,6 +93,6 @@ public class BluetoothLeAudioDeviceDetailsPreferenceController final boolean isLeAudioToggleVisible = SystemProperties.getBoolean( LE_AUDIO_TOGGLE_VISIBLE_PROPERTY, LE_AUDIO_TOGGLE_VISIBLE_DEFAULT_VALUE); - ((SwitchPreference) mPreference).setChecked(isLeAudioToggleVisible); + ((TwoStatePreference) mPreference).setChecked(isLeAudioToggleVisible); } } diff --git a/src/com/android/settings/development/BluetoothLeAudioHwOffloadPreferenceController.java b/src/com/android/settings/development/BluetoothLeAudioHwOffloadPreferenceController.java index 904f8280927..91b9eb8ec77 100644 --- a/src/com/android/settings/development/BluetoothLeAudioHwOffloadPreferenceController.java +++ b/src/com/android/settings/development/BluetoothLeAudioHwOffloadPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.development; import static com.android.settings.development.BluetoothA2dpHwOffloadPreferenceController.A2DP_OFFLOAD_DISABLED_PROPERTY; - import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothManager; import android.bluetooth.BluetoothStatusCodes; @@ -27,7 +26,7 @@ import android.os.SystemProperties; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -87,10 +86,10 @@ public class BluetoothLeAudioHwOffloadPreferenceController if (leAudioEnabled && leAudioOffloadSupported && !a2dpOffloadDisabled) { final boolean offloadDisabled = SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, true); - ((SwitchPreference) mPreference).setChecked(offloadDisabled); + ((TwoStatePreference) mPreference).setChecked(offloadDisabled); } else { mPreference.setEnabled(false); - ((SwitchPreference) mPreference).setChecked(true); + ((TwoStatePreference) mPreference).setChecked(true); } } @@ -108,7 +107,7 @@ public class BluetoothLeAudioHwOffloadPreferenceController final boolean a2dpOffloadDisabled = SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false); if (leAudioEnabled && leAudioOffloadSupported && !a2dpOffloadDisabled) { - ((SwitchPreference) mPreference).setChecked(true); + ((TwoStatePreference) mPreference).setChecked(true); SystemProperties.set(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, "true"); } else { mPreference.setEnabled(false); diff --git a/src/com/android/settings/development/BluetoothLeAudioPreferenceController.java b/src/com/android/settings/development/BluetoothLeAudioPreferenceController.java index 9cbbc7f37bb..f1b81b4a2d6 100644 --- a/src/com/android/settings/development/BluetoothLeAudioPreferenceController.java +++ b/src/com/android/settings/development/BluetoothLeAudioPreferenceController.java @@ -24,7 +24,7 @@ import android.os.SystemProperties; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -84,7 +84,7 @@ public class BluetoothLeAudioPreferenceController final boolean leAudioEnabled = (isLeAudioSupportedStatus == BluetoothStatusCodes.FEATURE_SUPPORTED); - ((SwitchPreference) mPreference).setChecked(!leAudioEnabled); + ((TwoStatePreference) mPreference).setChecked(!leAudioEnabled); // Disable option if Bluetooth is disabled or if switch is not supported if (isLeAudioSupportedStatus == BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED diff --git a/src/com/android/settings/development/BugReportInPowerPreferenceController.java b/src/com/android/settings/development/BugReportInPowerPreferenceController.java index 5ad63e0ac96..c8c46c96a59 100644 --- a/src/com/android/settings/development/BugReportInPowerPreferenceController.java +++ b/src/com/android/settings/development/BugReportInPowerPreferenceController.java @@ -22,7 +22,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -68,7 +68,7 @@ public class BugReportInPowerPreferenceController extends public void updateState(Preference preference) { final int mode = Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); } @Override @@ -76,6 +76,6 @@ public class BugReportInPowerPreferenceController extends super.onDeveloperOptionsSwitchDisabled(); Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java index 67172809535..0a9600ab441 100644 --- a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java +++ b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java @@ -22,7 +22,7 @@ import android.text.TextUtils; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -72,7 +72,7 @@ public class CameraLaserSensorPreferenceController extends DeveloperOptionsPrefe @Override public void updateState(Preference preference) { final boolean enabled = isLaserSensorEnabled(); - ((SwitchPreference) mPreference).setChecked(enabled); + ((TwoStatePreference) mPreference).setChecked(enabled); } // There should be no impact on the current diff --git a/src/com/android/settings/development/ColorModePreference.java b/src/com/android/settings/development/ColorModePreference.java index fef9d212ed7..f4a2c797507 100644 --- a/src/com/android/settings/development/ColorModePreference.java +++ b/src/com/android/settings/development/ColorModePreference.java @@ -24,14 +24,14 @@ import android.os.Looper; import android.util.AttributeSet; import android.view.Display; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settingslib.R; import java.util.ArrayList; import java.util.List; -public class ColorModePreference extends SwitchPreference implements DisplayListener { +public class ColorModePreference extends TwoStatePreference implements DisplayListener { private DisplayManager mDisplayManager; private Display mDisplay; diff --git a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java index 54df6badb02..82964e7cb06 100644 --- a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java +++ b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java @@ -22,7 +22,7 @@ import android.widget.Toast; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -65,14 +65,14 @@ public class CoolColorTemperaturePreferenceController extends DeveloperOptionsPr public void updateState(Preference preference) { final boolean enableColorTemperature = SystemProperties.getBoolean( COLOR_TEMPERATURE_PROPERTY, false /* default */); - ((SwitchPreference) mPreference).setChecked(enableColorTemperature); + ((TwoStatePreference) mPreference).setChecked(enableColorTemperature); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); SystemProperties.set(COLOR_TEMPERATURE_PROPERTY, Boolean.toString(false)); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } @VisibleForTesting diff --git a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java index 04d819c86a6..58d764c439e 100644 --- a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java +++ b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java @@ -21,7 +21,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -59,7 +59,7 @@ public class DebugViewAttributesPreferenceController extends public void updateState(Preference preference) { final int debugViewAttrMode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0 /* default */); - ((SwitchPreference) mPreference).setChecked(debugViewAttrMode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(debugViewAttrMode != SETTING_VALUE_OFF); } @Override @@ -67,6 +67,6 @@ public class DebugViewAttributesPreferenceController extends super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEBUG_VIEW_ATTRIBUTES, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/DesktopModePreferenceController.java b/src/com/android/settings/development/DesktopModePreferenceController.java index 0e257f69dd6..dcd0c14033d 100644 --- a/src/com/android/settings/development/DesktopModePreferenceController.java +++ b/src/com/android/settings/development/DesktopModePreferenceController.java @@ -24,7 +24,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -71,7 +71,7 @@ public class DesktopModePreferenceController extends DeveloperOptionsPreferenceC public void updateState(Preference preference) { final int mode = Settings.Global.getInt(mContext.getContentResolver(), DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); } @Override @@ -79,7 +79,7 @@ public class DesktopModePreferenceController extends DeveloperOptionsPreferenceC super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } @VisibleForTesting diff --git a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java index f10e171c8c7..4f7fb4d48fd 100644 --- a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java +++ b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java @@ -21,7 +21,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -63,7 +63,7 @@ public class DisableAutomaticUpdatesPreferenceController extends final int updatesEnabled = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, 0 /* default */); - ((SwitchPreference) mPreference).setChecked(updatesEnabled != DISABLE_UPDATES_SETTING); + ((TwoStatePreference) mPreference).setChecked(updatesEnabled != DISABLE_UPDATES_SETTING); } @Override @@ -71,6 +71,6 @@ public class DisableAutomaticUpdatesPreferenceController extends super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, DISABLE_UPDATES_SETTING); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/EnableBlursPreferenceController.java b/src/com/android/settings/development/EnableBlursPreferenceController.java index 129d9993c63..d3a521a7798 100644 --- a/src/com/android/settings/development/EnableBlursPreferenceController.java +++ b/src/com/android/settings/development/EnableBlursPreferenceController.java @@ -23,7 +23,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -69,7 +69,7 @@ public final class EnableBlursPreferenceController extends DeveloperOptionsPrefe public void updateState(Preference preference) { boolean isEnabled = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.DISABLE_WINDOW_BLURS, 0) == 0; - ((SwitchPreference) mPreference).setChecked(isEnabled); + ((TwoStatePreference) mPreference).setChecked(isEnabled); } @Override diff --git a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java index 6348d623e19..69a4154e830 100644 --- a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java +++ b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java @@ -20,7 +20,7 @@ import android.content.Context; import android.provider.Settings; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -59,7 +59,8 @@ public class EnableGnssRawMeasFullTrackingPreferenceController extends final int enableGnssRawMeasFullTrackingMode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(enableGnssRawMeasFullTrackingMode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference) + .setChecked(enableGnssRawMeasFullTrackingMode != SETTING_VALUE_OFF); } @Override @@ -67,6 +68,6 @@ public class EnableGnssRawMeasFullTrackingPreferenceController extends super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java index 163605fb175..847bd4111de 100644 --- a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java +++ b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java @@ -21,7 +21,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -58,7 +58,8 @@ public class EnableGpuDebugLayersPreferenceController extends DeveloperOptionsPr public void updateState(Preference preference) { final int enableGpuDebugLayersMode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.ENABLE_GPU_DEBUG_LAYERS, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(enableGpuDebugLayersMode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference) + .setChecked(enableGpuDebugLayersMode != SETTING_VALUE_OFF); } @Override @@ -66,6 +67,6 @@ public class EnableGpuDebugLayersPreferenceController extends DeveloperOptionsPr super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.ENABLE_GPU_DEBUG_LAYERS, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/EnableVerboseVendorLoggingPreferenceController.java b/src/com/android/settings/development/EnableVerboseVendorLoggingPreferenceController.java index f13143dfdce..24257688d27 100644 --- a/src/com/android/settings/development/EnableVerboseVendorLoggingPreferenceController.java +++ b/src/com/android/settings/development/EnableVerboseVendorLoggingPreferenceController.java @@ -25,7 +25,7 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -84,7 +84,7 @@ public class EnableVerboseVendorLoggingPreferenceController ThreadUtils.postOnBackgroundThread(() -> { final boolean enabled = getVerboseLoggingEnabled(); ThreadUtils.getUiThreadHandler().post(() -> - ((SwitchPreference) mPreference).setChecked(enabled)); + ((TwoStatePreference) mPreference).setChecked(enabled)); } ); } @@ -95,7 +95,7 @@ public class EnableVerboseVendorLoggingPreferenceController super.onDeveloperOptionsSwitchDisabled(); ThreadUtils.postOnBackgroundThread(() -> setVerboseLoggingEnabled(false)); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } @VisibleForTesting diff --git a/src/com/android/settings/development/ForceDarkPreferenceController.java b/src/com/android/settings/development/ForceDarkPreferenceController.java index 90e67e0613a..c81c16f3263 100644 --- a/src/com/android/settings/development/ForceDarkPreferenceController.java +++ b/src/com/android/settings/development/ForceDarkPreferenceController.java @@ -21,7 +21,7 @@ import android.os.SystemProperties; import android.view.ThreadedRenderer; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -54,13 +54,13 @@ public class ForceDarkPreferenceController extends DeveloperOptionsPreferenceCon public void updateState(Preference preference) { final boolean isEnabled = SystemProperties.getBoolean( ThreadedRenderer.DEBUG_FORCE_DARK, false /* default */); - ((SwitchPreference) mPreference).setChecked(isEnabled); + ((TwoStatePreference) mPreference).setChecked(isEnabled); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); SystemProperties.set(ThreadedRenderer.DEBUG_FORCE_DARK, null); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/ForceEnableNotesRolePreferenceController.java b/src/com/android/settings/development/ForceEnableNotesRolePreferenceController.java index 4060bb696f9..45eeafa2a34 100644 --- a/src/com/android/settings/development/ForceEnableNotesRolePreferenceController.java +++ b/src/com/android/settings/development/ForceEnableNotesRolePreferenceController.java @@ -39,7 +39,7 @@ import android.os.ServiceManager; import android.os.UserManager; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; @@ -81,13 +81,13 @@ public class ForceEnableNotesRolePreferenceController @Override public void updateState(Preference preference) { - ((SwitchPreference) mPreference).setChecked(isEnabled()); + ((TwoStatePreference) mPreference).setChecked(isEnabled()); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); setEnabled(false); } diff --git a/src/com/android/settings/development/ForceMSAAPreferenceController.java b/src/com/android/settings/development/ForceMSAAPreferenceController.java index a1a4d66317b..4fd4cc21487 100644 --- a/src/com/android/settings/development/ForceMSAAPreferenceController.java +++ b/src/com/android/settings/development/ForceMSAAPreferenceController.java @@ -20,7 +20,7 @@ import android.content.Context; import android.sysprop.DisplayProperties; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -51,13 +51,13 @@ public class ForceMSAAPreferenceController extends DeveloperOptionsPreferenceCon @Override public void updateState(Preference preference) { final boolean isEnabled = DisplayProperties.debug_force_msaa().orElse(false); - ((SwitchPreference) mPreference).setChecked(isEnabled); + ((TwoStatePreference) mPreference).setChecked(isEnabled); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); DisplayProperties.debug_force_msaa(false); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java b/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java index a967888b0f6..80b295c60fd 100644 --- a/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java +++ b/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java @@ -26,7 +26,7 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -72,7 +72,7 @@ public class ForcePeakRefreshRatePreferenceController extends DeveloperOptionsPr @Override public void updateState(Preference preference) { - ((SwitchPreference) mPreference).setChecked(isForcePeakRefreshRateEnabled()); + ((TwoStatePreference) mPreference).setChecked(isForcePeakRefreshRateEnabled()); } @Override @@ -90,7 +90,7 @@ public class ForcePeakRefreshRatePreferenceController extends DeveloperOptionsPr Settings.System.putFloat(mContext.getContentResolver(), Settings.System.MIN_REFRESH_RATE, NO_CONFIG); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } @VisibleForTesting diff --git a/src/com/android/settings/development/FreeformWindowsPreferenceController.java b/src/com/android/settings/development/FreeformWindowsPreferenceController.java index 8bb2b1c4feb..872c046545a 100644 --- a/src/com/android/settings/development/FreeformWindowsPreferenceController.java +++ b/src/com/android/settings/development/FreeformWindowsPreferenceController.java @@ -22,7 +22,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -69,7 +69,7 @@ public class FreeformWindowsPreferenceController extends DeveloperOptionsPrefere public void updateState(Preference preference) { final int mode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); } @Override @@ -77,7 +77,7 @@ public class FreeformWindowsPreferenceController extends DeveloperOptionsPrefere super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } @VisibleForTesting diff --git a/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java index d79c231e334..1c167621060 100644 --- a/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java @@ -20,7 +20,7 @@ import android.content.Context; import android.provider.Settings; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -67,13 +67,13 @@ public abstract class GlobalSettingSwitchPreferenceController extends public void updateState(Preference preference) { final int mode = Settings.Global.getInt(mContext.getContentResolver(), mSettingsKey, mDefault); - ((SwitchPreference) mPreference).setChecked(mode != mOff); + ((TwoStatePreference) mPreference).setChecked(mode != mOff); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), mSettingsKey, mOff); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java index 0087e287093..dc0c9841272 100644 --- a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java +++ b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java @@ -21,7 +21,7 @@ import android.os.SystemProperties; import android.view.ThreadedRenderer; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -54,13 +54,13 @@ public class GpuViewUpdatesPreferenceController extends DeveloperOptionsPreferen public void updateState(Preference preference) { final boolean isEnabled = SystemProperties.getBoolean( ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false /* default */); - ((SwitchPreference) mPreference).setChecked(isEnabled); + ((TwoStatePreference) mPreference).setChecked(isEnabled); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); SystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, null); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java index 8ffbdcdc1cc..5a1f6f5b9e6 100644 --- a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java +++ b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java @@ -21,7 +21,7 @@ import android.os.SystemProperties; import android.view.ThreadedRenderer; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -54,13 +54,13 @@ public class HardwareLayersUpdatesPreferenceController extends DeveloperOptionsP public void updateState(Preference preference) { final boolean isEnabled = SystemProperties.getBoolean( ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false /* default */); - ((SwitchPreference) mPreference).setChecked(isEnabled); + ((TwoStatePreference) mPreference).setChecked(isEnabled); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, null); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java index c10e1070a48..8ebf3cdeee0 100644 --- a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java +++ b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java @@ -24,7 +24,7 @@ import android.os.ServiceManager; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -71,7 +71,7 @@ public class HardwareOverlaysPreferenceController extends DeveloperOptionsPrefer @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); - final SwitchPreference switchPreference = (SwitchPreference) mPreference; + final TwoStatePreference switchPreference = (TwoStatePreference) mPreference; if (switchPreference.isChecked()) { // Writing false to the preference when the setting is already off will have a // side effect of turning on the preference that we wish to avoid @@ -96,7 +96,7 @@ public class HardwareOverlaysPreferenceController extends DeveloperOptionsPrefer @SuppressWarnings("unused") final int showUpdates = reply.readInt(); @SuppressWarnings("unused") final int showBackground = reply.readInt(); final int disableOverlays = reply.readInt(); - ((SwitchPreference) mPreference).setChecked(disableOverlays != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(disableOverlays != SETTING_VALUE_OFF); reply.recycle(); data.recycle(); } catch (RemoteException ex) { diff --git a/src/com/android/settings/development/KeepActivitiesPreferenceController.java b/src/com/android/settings/development/KeepActivitiesPreferenceController.java index 0ba2c42dbcf..ef8daaa5cc5 100644 --- a/src/com/android/settings/development/KeepActivitiesPreferenceController.java +++ b/src/com/android/settings/development/KeepActivitiesPreferenceController.java @@ -25,7 +25,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -68,14 +68,14 @@ public class KeepActivitiesPreferenceController extends DeveloperOptionsPreferen public void updateState(Preference preference) { final int mode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.ALWAYS_FINISH_ACTIVITIES, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); writeImmediatelyDestroyActivitiesOptions(false); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } private void writeImmediatelyDestroyActivitiesOptions(boolean isEnabled) { diff --git a/src/com/android/settings/development/LocalTerminalPreferenceController.java b/src/com/android/settings/development/LocalTerminalPreferenceController.java index d48615c7fcf..797ba515d20 100644 --- a/src/com/android/settings/development/LocalTerminalPreferenceController.java +++ b/src/com/android/settings/development/LocalTerminalPreferenceController.java @@ -7,7 +7,7 @@ import android.os.UserManager; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -63,7 +63,7 @@ public class LocalTerminalPreferenceController extends DeveloperOptionsPreferenc public void updateState(Preference preference) { final boolean isTerminalEnabled = mPackageManager.getApplicationEnabledSetting( TERMINAL_APP_PACKAGE) == PackageManager.COMPONENT_ENABLED_STATE_ENABLED; - ((SwitchPreference) mPreference).setChecked(isTerminalEnabled); + ((TwoStatePreference) mPreference).setChecked(isTerminalEnabled); } @Override @@ -78,7 +78,7 @@ public class LocalTerminalPreferenceController extends DeveloperOptionsPreferenc super.onDeveloperOptionsSwitchDisabled(); mPackageManager.setApplicationEnabledSetting(TERMINAL_APP_PACKAGE, PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } @VisibleForTesting diff --git a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java index b2fa693104e..8d5990ae558 100644 --- a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java +++ b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java @@ -21,7 +21,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -59,7 +59,7 @@ public class MobileDataAlwaysOnPreferenceController extends final int mobileDataAlwaysOnMode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON, SETTING_VALUE_ON); - ((SwitchPreference) mPreference).setChecked(mobileDataAlwaysOnMode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(mobileDataAlwaysOnMode != SETTING_VALUE_OFF); } @Override @@ -67,6 +67,6 @@ public class MobileDataAlwaysOnPreferenceController extends super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON, SETTING_VALUE_ON); - ((SwitchPreference) mPreference).setChecked(true); + ((TwoStatePreference) mPreference).setChecked(true); } } diff --git a/src/com/android/settings/development/MockModemPreferenceController.java b/src/com/android/settings/development/MockModemPreferenceController.java index 655f15767c5..aaca787e60b 100644 --- a/src/com/android/settings/development/MockModemPreferenceController.java +++ b/src/com/android/settings/development/MockModemPreferenceController.java @@ -22,7 +22,7 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -67,7 +67,7 @@ public class MockModemPreferenceController extends try { final boolean isEnabled = SystemProperties.getBoolean( ALLOW_MOCK_MODEM_PROPERTY, false /* default */); - ((SwitchPreference) mPreference).setChecked(isEnabled); + ((TwoStatePreference) mPreference).setChecked(isEnabled); } catch (RuntimeException e) { Log.e(TAG, "Fail to get radio system property: " + e.getMessage()); } @@ -78,7 +78,7 @@ public class MockModemPreferenceController extends super.onDeveloperOptionsSwitchDisabled(); try { SystemProperties.set(ALLOW_MOCK_MODEM_PROPERTY, "false"); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } catch (RuntimeException e) { Log.e(TAG, "Fail to set radio system property: " + e.getMessage()); } diff --git a/src/com/android/settings/development/NfcSnoopLogPreferenceController.java b/src/com/android/settings/development/NfcSnoopLogPreferenceController.java index ef7e194bb66..01fbb92ea7a 100644 --- a/src/com/android/settings/development/NfcSnoopLogPreferenceController.java +++ b/src/com/android/settings/development/NfcSnoopLogPreferenceController.java @@ -22,7 +22,7 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -69,7 +69,7 @@ public class NfcSnoopLogPreferenceController extends public void updateState(Preference preference) { try { final String currentValue = SystemProperties.get(NFC_NFCSNOOP_LOG_MODE_PROPERTY); - ((SwitchPreference) mPreference).setChecked(currentValue.equals(NFCSNOOP_MODE_FULL)); + ((TwoStatePreference) mPreference).setChecked(currentValue.equals(NFCSNOOP_MODE_FULL)); } catch (RuntimeException e) { Log.e(TAG, "Fail to get nfc system property: " + e.getMessage()); } @@ -80,7 +80,7 @@ public class NfcSnoopLogPreferenceController extends super.onDeveloperOptionsSwitchDisabled(); try { SystemProperties.set(NFC_NFCSNOOP_LOG_MODE_PROPERTY, NFCSNOOP_MODE_FILTERED); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } catch (RuntimeException e) { Log.e(TAG, "Fail to set nfc system property: " + e.getMessage()); } diff --git a/src/com/android/settings/development/NfcStackDebugLogPreferenceController.java b/src/com/android/settings/development/NfcStackDebugLogPreferenceController.java index a3cab25520d..4464923b958 100644 --- a/src/com/android/settings/development/NfcStackDebugLogPreferenceController.java +++ b/src/com/android/settings/development/NfcStackDebugLogPreferenceController.java @@ -22,7 +22,7 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -63,7 +63,7 @@ public class NfcStackDebugLogPreferenceController extends try { final boolean isEnabled = SystemProperties.getBoolean( NFC_STACK_DEBUGLOG_ENABLED_PROPERTY, false /* default */); - ((SwitchPreference) mPreference).setChecked(isEnabled); + ((TwoStatePreference) mPreference).setChecked(isEnabled); } catch (RuntimeException e) { Log.e(TAG, "Fail to get nfc system property: " + e.getMessage()); } @@ -74,7 +74,7 @@ public class NfcStackDebugLogPreferenceController extends super.onDeveloperOptionsSwitchDisabled(); try { SystemProperties.set(NFC_STACK_DEBUGLOG_ENABLED_PROPERTY, "false"); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } catch (RuntimeException e) { Log.e(TAG, "Fail to set nfc system property: " + e.getMessage()); } diff --git a/src/com/android/settings/development/NfcVerboseVendorLogPreferenceController.java b/src/com/android/settings/development/NfcVerboseVendorLogPreferenceController.java index dcac14c39c5..d0f9d9ee0ef 100644 --- a/src/com/android/settings/development/NfcVerboseVendorLogPreferenceController.java +++ b/src/com/android/settings/development/NfcVerboseVendorLogPreferenceController.java @@ -22,7 +22,7 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -69,7 +69,7 @@ public class NfcVerboseVendorLogPreferenceController public void updateState(Preference preference) { try { final String currentValue = SystemProperties.get(NFC_VERBOSE_VENDOR_LOG_PROPERTY); - ((SwitchPreference) mPreference) + ((TwoStatePreference) mPreference) .setChecked(currentValue.equals(VERBOSE_VENDOR_LOG_ENABLED)); } catch (RuntimeException e) { Log.e(TAG, "Fail to get nfc system property: " + e.getMessage()); @@ -81,7 +81,7 @@ public class NfcVerboseVendorLogPreferenceController super.onDeveloperOptionsSwitchDisabled(); try { SystemProperties.set(NFC_VERBOSE_VENDOR_LOG_PROPERTY, VERBOSE_VENDOR_LOG_DISABLED); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } catch (RuntimeException e) { Log.e(TAG, "Fail to set nfc system property: " + e.getMessage()); } diff --git a/src/com/android/settings/development/NonResizableMultiWindowPreferenceController.java b/src/com/android/settings/development/NonResizableMultiWindowPreferenceController.java index b1c4be9ae79..50d90bdb3e6 100644 --- a/src/com/android/settings/development/NonResizableMultiWindowPreferenceController.java +++ b/src/com/android/settings/development/NonResizableMultiWindowPreferenceController.java @@ -23,7 +23,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -66,7 +66,7 @@ public class NonResizableMultiWindowPreferenceController public void updateState(Preference preference) { final int mode = Settings.Global.getInt(mContext.getContentResolver(), DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); } @Override @@ -74,6 +74,6 @@ public class NonResizableMultiWindowPreferenceController super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java index 22b3f8360c4..93fe7f01fa4 100644 --- a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java +++ b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java @@ -22,7 +22,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -62,7 +62,7 @@ public class NotificationChannelWarningsPreferenceController extends public void updateState(Preference preference) { final int mode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, 0); - ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); } @Override @@ -70,7 +70,7 @@ public class NotificationChannelWarningsPreferenceController extends super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } @VisibleForTesting diff --git a/src/com/android/settings/development/OverlaySettingsPreferenceController.java b/src/com/android/settings/development/OverlaySettingsPreferenceController.java index cd08793a9e4..c60cb6f8ba5 100644 --- a/src/com/android/settings/development/OverlaySettingsPreferenceController.java +++ b/src/com/android/settings/development/OverlaySettingsPreferenceController.java @@ -23,7 +23,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -59,7 +59,7 @@ public class OverlaySettingsPreferenceController extends DeveloperOptionsPrefere @Override public void updateState(Preference preference) { - ((SwitchPreference) preference).setChecked(isOverlaySettingsEnabled(mContext)); + ((TwoStatePreference) preference).setChecked(isOverlaySettingsEnabled(mContext)); } /** diff --git a/src/com/android/settings/development/PhantomProcessPreferenceController.java b/src/com/android/settings/development/PhantomProcessPreferenceController.java index b277fe1fdb7..f03cf952fa0 100644 --- a/src/com/android/settings/development/PhantomProcessPreferenceController.java +++ b/src/com/android/settings/development/PhantomProcessPreferenceController.java @@ -23,7 +23,7 @@ import android.util.FeatureFlagUtils; import android.util.Log; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -66,7 +66,7 @@ public class PhantomProcessPreferenceController extends try { final boolean isEnabled = !FeatureFlagUtils.isEnabled(mContext, SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS); - ((SwitchPreference) mPreference).setChecked(isEnabled); + ((TwoStatePreference) mPreference).setChecked(isEnabled); } catch (RuntimeException e) { Log.e(TAG, "Fail to get feature flag: " + e.getMessage()); } @@ -79,7 +79,7 @@ public class PhantomProcessPreferenceController extends FeatureFlagUtils.setEnabled(mContext, SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS, true /* Enable the monitoring */); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } catch (RuntimeException e) { Log.e(TAG, "Fail to set feature flag: " + e.getMessage()); } diff --git a/src/com/android/settings/development/PointerLocationPreferenceController.java b/src/com/android/settings/development/PointerLocationPreferenceController.java index 0fd0137cb24..3b76740928b 100644 --- a/src/com/android/settings/development/PointerLocationPreferenceController.java +++ b/src/com/android/settings/development/PointerLocationPreferenceController.java @@ -21,7 +21,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -57,7 +57,7 @@ public class PointerLocationPreferenceController extends DeveloperOptionsPrefere public void updateState(Preference preference) { final int pointerLocationMode = Settings.System.getInt(mContext.getContentResolver(), Settings.System.POINTER_LOCATION, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(pointerLocationMode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(pointerLocationMode != SETTING_VALUE_OFF); } @Override @@ -65,6 +65,6 @@ public class PointerLocationPreferenceController extends DeveloperOptionsPrefere super.onDeveloperOptionsSwitchDisabled(); Settings.System.putInt(mContext.getContentResolver(), Settings.System.POINTER_LOCATION, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/ResizableActivityPreferenceController.java b/src/com/android/settings/development/ResizableActivityPreferenceController.java index c74e995540d..28b1478d49e 100644 --- a/src/com/android/settings/development/ResizableActivityPreferenceController.java +++ b/src/com/android/settings/development/ResizableActivityPreferenceController.java @@ -21,7 +21,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -58,7 +58,7 @@ public class ResizableActivityPreferenceController extends DeveloperOptionsPrefe public void updateState(Preference preference) { final int mode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); } @Override @@ -66,6 +66,6 @@ public class ResizableActivityPreferenceController extends DeveloperOptionsPrefe super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/RtlLayoutPreferenceController.java b/src/com/android/settings/development/RtlLayoutPreferenceController.java index 913259efe17..bb7061d148f 100644 --- a/src/com/android/settings/development/RtlLayoutPreferenceController.java +++ b/src/com/android/settings/development/RtlLayoutPreferenceController.java @@ -22,7 +22,7 @@ import android.sysprop.DisplayProperties; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.app.LocalePicker; import com.android.settings.core.PreferenceControllerMixin; @@ -59,7 +59,7 @@ public class RtlLayoutPreferenceController extends DeveloperOptionsPreferenceCon public void updateState(Preference preference) { int rtlLayoutMode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RTL, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(rtlLayoutMode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(rtlLayoutMode != SETTING_VALUE_OFF); } @Override @@ -67,7 +67,7 @@ public class RtlLayoutPreferenceController extends DeveloperOptionsPreferenceCon super.onDeveloperOptionsSwitchDisabled(); writeToForceRtlLayoutSetting(false); updateLocales(); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } @VisibleForTesting diff --git a/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java index a72c0e05e1a..199ecab583b 100644 --- a/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java @@ -20,7 +20,7 @@ import android.content.Context; import android.provider.Settings; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -54,13 +54,13 @@ public abstract class SecureSettingSwitchPreferenceController extends public void updateState(Preference preference) { final int mode = Settings.Secure.getInt( mContext.getContentResolver(), mSettingsKey, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); Settings.Secure.putInt(mContext.getContentResolver(), mSettingsKey, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java index 5e0cda82944..df5ad4e0a98 100644 --- a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java +++ b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java @@ -21,7 +21,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -66,7 +66,7 @@ public class ShowFirstCrashDialogPreferenceController extends DeveloperOptionsPr public void updateState(Preference preference) { final int mode = Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); } @Override @@ -74,6 +74,6 @@ public class ShowFirstCrashDialogPreferenceController extends DeveloperOptionsPr super.onDeveloperOptionsSwitchDisabled(); Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/ShowKeyPressesPreferenceController.java b/src/com/android/settings/development/ShowKeyPressesPreferenceController.java index 247f59a5385..e8faec55193 100644 --- a/src/com/android/settings/development/ShowKeyPressesPreferenceController.java +++ b/src/com/android/settings/development/ShowKeyPressesPreferenceController.java @@ -21,7 +21,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -59,7 +59,7 @@ public class ShowKeyPressesPreferenceController extends public void updateState(Preference preference) { int showKeyPresses = Settings.System.getInt(mContext.getContentResolver(), Settings.System.SHOW_KEY_PRESSES, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(showKeyPresses != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(showKeyPresses != SETTING_VALUE_OFF); } @Override @@ -67,6 +67,6 @@ public class ShowKeyPressesPreferenceController extends super.onDeveloperOptionsSwitchDisabled(); Settings.System.putInt(mContext.getContentResolver(), Settings.System.SHOW_KEY_PRESSES, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java index f78a2970c13..f439874f6e6 100644 --- a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java +++ b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java @@ -20,7 +20,7 @@ import android.content.Context; import android.sysprop.DisplayProperties; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -51,13 +51,13 @@ public class ShowLayoutBoundsPreferenceController extends DeveloperOptionsPrefer @Override public void updateState(Preference preference) { final boolean isEnabled = DisplayProperties.debug_layout().orElse(false); - ((SwitchPreference) mPreference).setChecked(isEnabled); + ((TwoStatePreference) mPreference).setChecked(isEnabled); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); DisplayProperties.debug_layout(false); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/ShowRefreshRatePreferenceController.java b/src/com/android/settings/development/ShowRefreshRatePreferenceController.java index e56268d4c6a..4d522527d34 100644 --- a/src/com/android/settings/development/ShowRefreshRatePreferenceController.java +++ b/src/com/android/settings/development/ShowRefreshRatePreferenceController.java @@ -24,7 +24,7 @@ import android.os.ServiceManager; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -75,7 +75,7 @@ public class ShowRefreshRatePreferenceController extends DeveloperOptionsPrefere @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); - final SwitchPreference preference = (SwitchPreference) mPreference; + final TwoStatePreference preference = (TwoStatePreference) mPreference; if (preference.isChecked()) { // Writing false to the preference when the setting is already off will have a // side effect of turning on the preference that we wish to avoid @@ -95,7 +95,7 @@ public class ShowRefreshRatePreferenceController extends DeveloperOptionsPrefere data.writeInt(SETTING_VALUE_QUERY); mSurfaceFlinger.transact(SURFACE_FLINGER_CODE, data, reply, 0 /* flags */); final boolean enabled = reply.readBoolean(); - ((SwitchPreference) mPreference).setChecked(enabled); + ((TwoStatePreference) mPreference).setChecked(enabled); reply.recycle(); data.recycle(); } diff --git a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java index 5dadb6ff6c2..359bb803535 100644 --- a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java +++ b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java @@ -24,7 +24,7 @@ import android.os.ServiceManager; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -72,7 +72,7 @@ public class ShowSurfaceUpdatesPreferenceController extends DeveloperOptionsPref @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); - final SwitchPreference preference = (SwitchPreference) mPreference; + final TwoStatePreference preference = (TwoStatePreference) mPreference; if (preference.isChecked()) { // Writing false to the preference when the setting is already off will have a // side effect of turning on the preference that we wish to avoid @@ -93,7 +93,7 @@ public class ShowSurfaceUpdatesPreferenceController extends DeveloperOptionsPref @SuppressWarnings("unused") final int showCpu = reply.readInt(); @SuppressWarnings("unused") final int enableGL = reply.readInt(); final int showUpdates = reply.readInt(); - ((SwitchPreference) mPreference).setChecked(showUpdates != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(showUpdates != SETTING_VALUE_OFF); reply.recycle(); data.recycle(); } diff --git a/src/com/android/settings/development/ShowTapsPreferenceController.java b/src/com/android/settings/development/ShowTapsPreferenceController.java index 25d421ddf2b..e469a8c59c5 100644 --- a/src/com/android/settings/development/ShowTapsPreferenceController.java +++ b/src/com/android/settings/development/ShowTapsPreferenceController.java @@ -21,7 +21,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -57,7 +57,7 @@ public class ShowTapsPreferenceController extends DeveloperOptionsPreferenceCont public void updateState(Preference preference) { int showTapsMode = Settings.System.getInt(mContext.getContentResolver(), Settings.System.SHOW_TOUCHES, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(showTapsMode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(showTapsMode != SETTING_VALUE_OFF); } @Override @@ -65,6 +65,6 @@ public class ShowTapsPreferenceController extends DeveloperOptionsPreferenceCont super.onDeveloperOptionsSwitchDisabled(); Settings.System.putInt(mContext.getContentResolver(), Settings.System.SHOW_TOUCHES, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/StrictModePreferenceController.java b/src/com/android/settings/development/StrictModePreferenceController.java index c28e4766219..047c8ec9ab4 100644 --- a/src/com/android/settings/development/StrictModePreferenceController.java +++ b/src/com/android/settings/development/StrictModePreferenceController.java @@ -25,7 +25,7 @@ import android.view.IWindowManager; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -64,14 +64,14 @@ public class StrictModePreferenceController extends DeveloperOptionsPreferenceCo @Override public void updateState(Preference preference) { - ((SwitchPreference) mPreference).setChecked(isStrictModeEnabled()); + ((TwoStatePreference) mPreference).setChecked(isStrictModeEnabled()); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); writeStrictModeVisualOptions(false); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } private boolean isStrictModeEnabled() { diff --git a/src/com/android/settings/development/StylusHandwritingPreferenceController.java b/src/com/android/settings/development/StylusHandwritingPreferenceController.java index 12cd781023e..7a951448f8d 100644 --- a/src/com/android/settings/development/StylusHandwritingPreferenceController.java +++ b/src/com/android/settings/development/StylusHandwritingPreferenceController.java @@ -20,7 +20,7 @@ import android.content.Context; import android.provider.Settings; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -57,7 +57,7 @@ class StylusHandwritingPreferenceController extends DeveloperOptionsPreferenceCo final int enable = Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.STYLUS_HANDWRITING_ENABLED, Settings.Secure.STYLUS_HANDWRITING_DEFAULT_VALUE); - ((SwitchPreference) mPreference).setChecked(enable != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(enable != SETTING_VALUE_OFF); } @Override @@ -66,6 +66,6 @@ class StylusHandwritingPreferenceController extends DeveloperOptionsPreferenceCo Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.STYLUS_HANDWRITING_ENABLED, Settings.Secure.STYLUS_HANDWRITING_DEFAULT_VALUE); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java index 476cf50ffe6..c7b532a5b80 100644 --- a/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java @@ -20,7 +20,7 @@ import android.content.Context; import android.provider.Settings; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -54,13 +54,13 @@ public abstract class SystemSettingSwitchPreferenceController extends public void updateState(Preference preference) { final int mode = Settings.System.getInt( mContext.getContentResolver(), mSettingsKey, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); Settings.System.putInt(mContext.getContentResolver(), mSettingsKey, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java index f838a76cfa8..8fe619833d0 100644 --- a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java +++ b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java @@ -21,7 +21,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -61,7 +61,7 @@ public class TetheringHardwareAccelPreferenceController extends DeveloperOptions final int tetheringMode = Settings.Global.getInt( mContext.getContentResolver(), Settings.Global.TETHER_OFFLOAD_DISABLED, 0 /* default */); - ((SwitchPreference) mPreference).setChecked(tetheringMode != SETTING_VALUE_OFF); + ((TwoStatePreference) mPreference).setChecked(tetheringMode != SETTING_VALUE_OFF); } @Override @@ -69,6 +69,6 @@ public class TetheringHardwareAccelPreferenceController extends DeveloperOptions super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.TETHER_OFFLOAD_DISABLED, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/TransparentNavigationBarPreferenceController.java b/src/com/android/settings/development/TransparentNavigationBarPreferenceController.java index d1f54b54e18..16e72dbd4fe 100644 --- a/src/com/android/settings/development/TransparentNavigationBarPreferenceController.java +++ b/src/com/android/settings/development/TransparentNavigationBarPreferenceController.java @@ -24,7 +24,7 @@ import android.os.RemoteException; import android.os.ServiceManager; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; @@ -62,13 +62,13 @@ public class TransparentNavigationBarPreferenceController @Override public void updateState(Preference preference) { - ((SwitchPreference) mPreference).setChecked(isEnabled()); + ((TwoStatePreference) mPreference).setChecked(isEnabled()); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); final boolean enabled = isEnabled(); if (!enabled) { setEnabled(false); diff --git a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java index e130b2b653b..27a08a81f2e 100644 --- a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java +++ b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java @@ -25,7 +25,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; @@ -81,7 +81,7 @@ public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPrefere super.onDeveloperOptionsSwitchDisabled(); Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } @Override diff --git a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java index 80cb2250025..bb3b3e5fcd3 100644 --- a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java +++ b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java @@ -29,7 +29,7 @@ import android.text.TextUtils; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -79,7 +79,7 @@ public class WaitForDebuggerPreferenceController extends DeveloperOptionsPrefere } private void updateState(Preference preference, String debugApp) { - final SwitchPreference switchPreference = (SwitchPreference) preference; + final TwoStatePreference switchPreference = (TwoStatePreference) preference; final boolean debuggerEnabled = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER, SETTING_VALUE_OFF) != SETTING_VALUE_OFF; writeDebuggerAppOptions(debugApp, debuggerEnabled, true /* persistent */); @@ -92,7 +92,7 @@ public class WaitForDebuggerPreferenceController extends DeveloperOptionsPrefere super.onDeveloperOptionsSwitchDisabled(); writeDebuggerAppOptions(null /* package name */, false /* waitForDebugger */, false /* persistent */); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } @VisibleForTesting diff --git a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java index 0236f1585e2..ed1bb6efb08 100644 --- a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java +++ b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java @@ -21,7 +21,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -60,7 +60,7 @@ public class WifiDisplayCertificationPreferenceController extends final int wifiDisplayCertificationMode = Settings.Global.getInt( mContext.getContentResolver(), Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked( + ((TwoStatePreference) mPreference).setChecked( wifiDisplayCertificationMode != SETTING_VALUE_OFF); } @@ -69,6 +69,6 @@ public class WifiDisplayCertificationPreferenceController extends super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/WifiNonPersistentMacRandomizationPreferenceController.java b/src/com/android/settings/development/WifiNonPersistentMacRandomizationPreferenceController.java index 3f6d775c0b7..a4dcda4acf6 100644 --- a/src/com/android/settings/development/WifiNonPersistentMacRandomizationPreferenceController.java +++ b/src/com/android/settings/development/WifiNonPersistentMacRandomizationPreferenceController.java @@ -20,7 +20,7 @@ import android.content.Context; import android.provider.Settings; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -60,7 +60,7 @@ public class WifiNonPersistentMacRandomizationPreferenceController NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG, 0) == 1) { enabled = true; } - ((SwitchPreference) mPreference).setChecked(enabled); + ((TwoStatePreference) mPreference).setChecked(enabled); } @Override @@ -68,6 +68,6 @@ public class WifiNonPersistentMacRandomizationPreferenceController super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG, 0); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/WifiScanThrottlingPreferenceController.java b/src/com/android/settings/development/WifiScanThrottlingPreferenceController.java index 263269193c7..0adbbfd54a2 100644 --- a/src/com/android/settings/development/WifiScanThrottlingPreferenceController.java +++ b/src/com/android/settings/development/WifiScanThrottlingPreferenceController.java @@ -20,7 +20,7 @@ import android.content.Context; import android.net.wifi.WifiManager; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -50,13 +50,13 @@ public class WifiScanThrottlingPreferenceController extends DeveloperOptionsPref @Override public void updateState(Preference preference) { - ((SwitchPreference) mPreference).setChecked(mWifiManager.isScanThrottleEnabled()); + ((TwoStatePreference) mPreference).setChecked(mWifiManager.isScanThrottleEnabled()); } @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); mWifiManager.setScanThrottleEnabled(true); - ((SwitchPreference) mPreference).setChecked(true); + ((TwoStatePreference) mPreference).setChecked(true); } } diff --git a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java index 92ed65df338..9ee51933486 100644 --- a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java +++ b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java @@ -21,7 +21,7 @@ import android.net.wifi.WifiManager; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -59,7 +59,7 @@ public class WifiVerboseLoggingPreferenceController extends DeveloperOptionsPref @Override public void updateState(Preference preference) { final boolean enabled = mWifiManager.isVerboseLoggingEnabled(); - ((SwitchPreference) mPreference).setChecked(enabled); + ((TwoStatePreference) mPreference).setChecked(enabled); } @@ -67,6 +67,6 @@ public class WifiVerboseLoggingPreferenceController extends DeveloperOptionsPref protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); mWifiManager.setVerboseLoggingEnabled(false); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } diff --git a/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java b/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java index 8092194762f..feaa36e306f 100644 --- a/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java +++ b/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java @@ -22,7 +22,7 @@ import android.content.Context; import android.util.Log; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.development.BluetoothA2dpConfigStore; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -64,7 +64,7 @@ public class BluetoothHDAudioPreferenceController extends AbstractBluetoothPrefe if (supported) { final boolean isEnabled = bluetoothA2dp.isOptionalCodecsEnabled(activeDevice) == BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED; - ((SwitchPreference) mPreference).setChecked(isEnabled); + ((TwoStatePreference) mPreference).setChecked(isEnabled); } } diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java index 992136c9b70..482858fd779 100644 --- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java +++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java @@ -25,7 +25,7 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -164,16 +164,16 @@ public class GraphicsDriverEnableAngleAsSystemDriverController final String currentGlesDriver = mSystemProperties.get(PROPERTY_PERSISTENT_GRAPHICS_EGL, ""); final boolean isAngle = TextUtils.equals(ANGLE_DRIVER_SUFFIX, currentGlesDriver); - ((SwitchPreference) mPreference).setChecked(isAngle); + ((TwoStatePreference) mPreference).setChecked(isAngle); } else { mPreference.setEnabled(false); - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } // Disable the developer option toggle UI if ANGLE is disabled, this means next time the // debug property needs to be set to true again to enable ANGLE. If ANGLE is enabled, don't // disable the developer option toggle UI so that it can be turned off easily. - if (!isAngleDeveloperOptionEnabled() && !((SwitchPreference) mPreference).isChecked()) { + if (!isAngleDeveloperOptionEnabled() && !((TwoStatePreference) mPreference).isChecked()) { mPreference.setEnabled(false); } } @@ -186,7 +186,7 @@ public class GraphicsDriverEnableAngleAsSystemDriverController // 2) set the persist.graphics.egl empty string GraphicsEnvironment.getInstance().toggleAngleAsSystemDriver(false); // 3) reset the switch - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); } } @@ -197,7 +197,7 @@ public class GraphicsDriverEnableAngleAsSystemDriverController // if persist.graphics.egl = "angle", set the property value back to "" GraphicsEnvironment.getInstance().toggleAngleAsSystemDriver(false); // toggle switch off - ((SwitchPreference) mPreference).setChecked(false); + ((TwoStatePreference) mPreference).setChecked(false); return; } @@ -205,7 +205,7 @@ public class GraphicsDriverEnableAngleAsSystemDriverController // if persist.graphicx.egl = "", set the persist.graphics.egl back to "angle" GraphicsEnvironment.getInstance().toggleAngleAsSystemDriver(true); // toggle switch on - ((SwitchPreference) mPreference).setChecked(true); + ((TwoStatePreference) mPreference).setChecked(true); return; } diff --git a/src/com/android/settings/display/BatteryPercentagePreferenceController.java b/src/com/android/settings/display/BatteryPercentagePreferenceController.java index 22915eeaf61..a7113b3d490 100644 --- a/src/com/android/settings/display/BatteryPercentagePreferenceController.java +++ b/src/com/android/settings/display/BatteryPercentagePreferenceController.java @@ -23,7 +23,7 @@ import android.provider.Settings; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.R; import com.android.settings.Utils; @@ -71,7 +71,7 @@ public class BatteryPercentagePreferenceController extends BasePreferenceControl mContext.getResources().getBoolean( R.bool.config_defaultBatteryPercentageSetting) ? 1 : 0); - ((SwitchPreference) preference).setChecked(setting == 1); + ((TwoStatePreference) preference).setChecked(setting == 1); } @Override diff --git a/src/com/android/settings/display/CameraGesturePreferenceController.java b/src/com/android/settings/display/CameraGesturePreferenceController.java index 8e72a55227b..7d6fd7a0895 100644 --- a/src/com/android/settings/display/CameraGesturePreferenceController.java +++ b/src/com/android/settings/display/CameraGesturePreferenceController.java @@ -20,7 +20,7 @@ import android.os.SystemProperties; import android.provider.Settings; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -43,7 +43,7 @@ public class CameraGesturePreferenceController extends AbstractPreferenceControl public void updateState(Preference preference) { int value = Settings.Secure.getInt(mContext.getContentResolver(), CAMERA_GESTURE_DISABLED, 0); - ((SwitchPreference) preference).setChecked(value == 0); + ((TwoStatePreference) preference).setChecked(value == 0); } @Override diff --git a/src/com/android/settings/display/LiftToWakePreferenceController.java b/src/com/android/settings/display/LiftToWakePreferenceController.java index d12b7c4c15d..4725dc459c4 100644 --- a/src/com/android/settings/display/LiftToWakePreferenceController.java +++ b/src/com/android/settings/display/LiftToWakePreferenceController.java @@ -21,7 +21,7 @@ import android.hardware.SensorManager; import android.provider.Settings; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -56,6 +56,6 @@ public class LiftToWakePreferenceController extends AbstractPreferenceController @Override public void updateState(Preference preference) { int value = Settings.Secure.getInt(mContext.getContentResolver(), WAKE_GESTURE_ENABLED, 0); - ((SwitchPreference) preference).setChecked(value != 0); + ((TwoStatePreference) preference).setChecked(value != 0); } } diff --git a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java index 9e9bf8e59cf..558763a5ca6 100644 --- a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java +++ b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java @@ -20,7 +20,7 @@ import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -64,6 +64,6 @@ public class ShowOperatorNamePreferenceController extends AbstractPreferenceCont public void updateState(Preference preference) { int value = Settings.Secure.getInt(mContext.getContentResolver(), KEY_SHOW_OPERATOR_NAME, 1); - ((SwitchPreference) preference).setChecked(value != 0); + ((TwoStatePreference) preference).setChecked(value != 0); } } diff --git a/src/com/android/settings/display/TapToWakePreferenceController.java b/src/com/android/settings/display/TapToWakePreferenceController.java index 5c2d97530da..b074d21fc36 100644 --- a/src/com/android/settings/display/TapToWakePreferenceController.java +++ b/src/com/android/settings/display/TapToWakePreferenceController.java @@ -17,7 +17,7 @@ import android.content.Context; import android.provider.Settings; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -46,7 +46,7 @@ public class TapToWakePreferenceController extends AbstractPreferenceController public void updateState(Preference preference) { int value = Settings.Secure.getInt( mContext.getContentResolver(), Settings.Secure.DOUBLE_TAP_TO_WAKE, 0); - ((SwitchPreference) preference).setChecked(value != 0); + ((TwoStatePreference) preference).setChecked(value != 0); } @Override diff --git a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java index 25415f35149..8ed4c54bc66 100644 --- a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java +++ b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java @@ -19,7 +19,7 @@ import android.content.Context; import android.provider.Settings; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; @@ -52,7 +52,7 @@ public class AutoRestrictionPreferenceController extends BasePreferenceControlle super.updateState(preference); final boolean smartBatteryOn = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.APP_AUTO_RESTRICTION_ENABLED, ON) == ON; - ((SwitchPreference) preference).setChecked(smartBatteryOn); + ((TwoStatePreference) preference).setChecked(smartBatteryOn); } @Override diff --git a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java index 630cf82ef23..7afd1195987 100644 --- a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java @@ -22,7 +22,7 @@ import android.provider.Settings; import android.text.TextUtils; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; @@ -72,7 +72,7 @@ public class SmartBatteryPreferenceController extends BasePreferenceController i super.updateState(preference); final boolean smartBatteryOn = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, ON) == ON; - ((SwitchPreference) preference).setChecked(smartBatteryOn); + ((TwoStatePreference) preference).setChecked(smartBatteryOn); } @Override diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java index f06083abfae..0a39909f4d7 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java @@ -5,7 +5,7 @@ import android.provider.Settings; import android.provider.Settings.Global; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.Utils; @@ -54,7 +54,7 @@ public class BatterySaverStickyPreferenceController extends TogglePreferenceCont int setting = Settings.Global.getInt(mContext.getContentResolver(), Global.LOW_POWER_MODE_STICKY_AUTO_DISABLE_ENABLED, 1); - ((SwitchPreference) preference).setChecked(setting == 1); + ((TwoStatePreference) preference).setChecked(setting == 1); refreshSummary(preference); } diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index ed3bd1de3e5..ea2d4b93f55 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -16,8 +16,6 @@ package com.android.settings.inputmethod; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.app.Activity; import android.app.settings.SettingsEnums; import android.content.ContentResolver; @@ -37,11 +35,13 @@ import android.util.FeatureFlagUtils; import android.view.InputDevice; import android.view.inputmethod.InputMethodManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.util.Preconditions; import com.android.settings.R; @@ -79,8 +79,8 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment private KeyboardSettingsFeatureProvider mFeatureProvider; @NonNull private PreferenceCategory mKeyboardAssistanceCategory; - @NonNull - private SwitchPreference mShowVirtualKeyboardSwitch; + @Nullable + private TwoStatePreference mShowVirtualKeyboardSwitch = null; private Intent mIntentWaitingForResult; private boolean mIsNewKeyboardSettings; @@ -104,7 +104,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment mKeyboardAssistanceCategory = Preconditions.checkNotNull( (PreferenceCategory) findPreference(KEYBOARD_OPTIONS_CATEGORY)); mShowVirtualKeyboardSwitch = Preconditions.checkNotNull( - (SwitchPreference) mKeyboardAssistanceCategory.findPreference( + (TwoStatePreference) mKeyboardAssistanceCategory.findPreference( SHOW_VIRTUAL_KEYBOARD_SWITCH)); FeatureFactory featureFactory = FeatureFactory.getFeatureFactory(); diff --git a/src/com/android/settings/location/BluetoothScanningPreferenceController.java b/src/com/android/settings/location/BluetoothScanningPreferenceController.java index d16e1e58e2f..20447c17e78 100644 --- a/src/com/android/settings/location/BluetoothScanningPreferenceController.java +++ b/src/com/android/settings/location/BluetoothScanningPreferenceController.java @@ -17,7 +17,7 @@ import android.content.Context; import android.provider.Settings; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -43,7 +43,7 @@ public class BluetoothScanningPreferenceController extends AbstractPreferenceCon @Override public void updateState(Preference preference) { - ((SwitchPreference) preference).setChecked( + ((TwoStatePreference) preference).setChecked( Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1); } @@ -53,7 +53,7 @@ public class BluetoothScanningPreferenceController extends AbstractPreferenceCon if (KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE.equals(preference.getKey())) { Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, - ((SwitchPreference) preference).isChecked() ? 1 : 0); + ((TwoStatePreference) preference).isChecked() ? 1 : 0); return true; } return false; diff --git a/src/com/android/settings/location/WifiScanningPreferenceController.java b/src/com/android/settings/location/WifiScanningPreferenceController.java index 2e393a26382..f438ebbe029 100644 --- a/src/com/android/settings/location/WifiScanningPreferenceController.java +++ b/src/com/android/settings/location/WifiScanningPreferenceController.java @@ -17,7 +17,7 @@ import android.content.Context; import android.net.wifi.WifiManager; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -45,13 +45,13 @@ public class WifiScanningPreferenceController extends AbstractPreferenceControll @Override public void updateState(Preference preference) { - ((SwitchPreference) preference).setChecked(mWifiManager.isScanAlwaysAvailable()); + ((TwoStatePreference) preference).setChecked(mWifiManager.isScanAlwaysAvailable()); } @Override public boolean handlePreferenceTreeClick(Preference preference) { if (KEY_WIFI_SCAN_ALWAYS_AVAILABLE.equals(preference.getKey())) { - mWifiManager.setScanAlwaysAvailable(((SwitchPreference) preference).isChecked()); + mWifiManager.setScanAlwaysAvailable(((TwoStatePreference) preference).isChecked()); return true; } return false; diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java index 5b4ce1b00b9..b3fc5177e9d 100644 --- a/src/com/android/settings/network/AirplaneModePreferenceController.java +++ b/src/com/android/settings/network/AirplaneModePreferenceController.java @@ -30,7 +30,7 @@ import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.AirplaneModeEnabler; import com.android.settings.R; @@ -58,7 +58,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController private Fragment mFragment; private AirplaneModeEnabler mAirplaneModeEnabler; - private SwitchPreference mAirplaneModePreference; + private TwoStatePreference mAirplaneModePreference; public AirplaneModePreferenceController(Context context, String key) { super(context, key); diff --git a/src/com/android/settings/network/apn/ApnEditor.java b/src/com/android/settings/network/apn/ApnEditor.java index 5ff4b35d09f..d1b2f2fa3fc 100644 --- a/src/com/android/settings/network/apn/ApnEditor.java +++ b/src/com/android/settings/network/apn/ApnEditor.java @@ -48,7 +48,7 @@ import androidx.preference.ListPreference; import androidx.preference.MultiSelectListPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.util.ArrayUtils; import com.android.settings.R; @@ -119,7 +119,7 @@ public class ApnEditor extends SettingsPreferenceFragment @VisibleForTesting ListPreference mRoamingProtocol; @VisibleForTesting - SwitchPreference mCarrierEnabled; + TwoStatePreference mCarrierEnabled; @VisibleForTesting MultiSelectListPreference mBearerMulti; @VisibleForTesting @@ -1337,7 +1337,7 @@ public class ApnEditor extends SettingsPreferenceFragment mAuthType = (ListPreference) findPreference(KEY_AUTH_TYPE); mProtocol = (ListPreference) findPreference(KEY_PROTOCOL); mRoamingProtocol = (ListPreference) findPreference(KEY_ROAMING_PROTOCOL); - mCarrierEnabled = (SwitchPreference) findPreference(KEY_CARRIER_ENABLED); + mCarrierEnabled = (TwoStatePreference) findPreference(KEY_CARRIER_ENABLED); mBearerMulti = (MultiSelectListPreference) findPreference(KEY_BEARER_MULTI); mMvnoType = (ListPreference) findPreference(KEY_MVNO_TYPE); mMvnoMatchData = (EditTextPreference) findPreference("mvno_match_data"); diff --git a/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java b/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java index 7ebd2d73417..378d9a15b93 100644 --- a/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java +++ b/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java @@ -37,7 +37,7 @@ import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; @@ -64,7 +64,7 @@ public class AutoDataSwitchPreferenceController extends TelephonyTogglePreferenc SubscriptionsChangeListener.SubscriptionsChangeListenerClient { private static final String LOG_TAG = "AutoDataSwitchPrefCtrl"; - private SwitchPreference mPreference; + private TwoStatePreference mPreference; private SubscriptionsChangeListener mChangeListener; private TelephonyManager mManager; private MobileDataContentObserver mMobileDataContentObserver; diff --git a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java index f4ad478d383..d41629e0b16 100644 --- a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java +++ b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java @@ -33,7 +33,7 @@ import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.network.CarrierConfigCache; import com.android.settings.network.SubscriptionUtil; @@ -119,7 +119,7 @@ public class ContactDiscoveryPreferenceController extends TelephonyTogglePrefere @Override public void onChange(boolean selfChange, Uri uri) { Log.d(TAG, "UCE setting changed, re-evaluating."); - SwitchPreference switchPref = (SwitchPreference) preference; + TwoStatePreference switchPref = (TwoStatePreference) preference; switchPref.setChecked(isChecked()); } }; diff --git a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java index 12612d62adc..1b6f516b258 100644 --- a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java +++ b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java @@ -22,7 +22,6 @@ import android.content.Context; import android.content.DialogInterface; import android.os.PersistableBundle; import android.telephony.CarrierConfigManager; -import android.telephony.PhoneStateListener; import android.telephony.SubscriptionManager; import android.telephony.TelephonyCallback; import android.telephony.TelephonyManager; @@ -32,7 +31,7 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.telephony.util.ArrayUtils; import com.android.settings.R; @@ -153,7 +152,7 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc if (preference == null) { return; } - final SwitchPreference switchPreference = (SwitchPreference) preference; + final TwoStatePreference switchPreference = (TwoStatePreference) preference; final VolteQueryImsState queryState = queryImsState(mSubId); switchPreference.setEnabled(isUserControlAllowed(getCarrierConfigForSubId(mSubId)) diff --git a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java index 31b8138db2c..06015d4193e 100644 --- a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java +++ b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java @@ -31,7 +31,7 @@ import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.OnLifecycleEvent; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.network.MobileNetworkRepository; @@ -51,7 +51,7 @@ public class MobileDataPreferenceController extends TelephonyTogglePreferenceCon private static final String DIALOG_TAG = "MobileDataDialog"; - private SwitchPreference mPreference; + private TwoStatePreference mPreference; private TelephonyManager mTelephonyManager; private SubscriptionManager mSubscriptionManager; private FragmentManager mFragmentManager; @@ -143,7 +143,7 @@ public class MobileDataPreferenceController extends TelephonyTogglePreferenceCon @Override public void updateState(Preference preference) { super.updateState(preference); - mPreference = (SwitchPreference) preference; + mPreference = (TwoStatePreference) preference; update(); } diff --git a/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceController.java b/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceController.java index 5786dfc99cd..dc1c03fe68c 100644 --- a/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceController.java +++ b/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceController.java @@ -29,7 +29,7 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.telephony.util.ArrayUtils; import com.android.settingslib.core.lifecycle.LifecycleObserver; @@ -150,7 +150,7 @@ public class NrAdvancedCallingPreferenceController extends TelephonyTogglePrefer if (preference == null) { return; } - final SwitchPreference switchPreference = (SwitchPreference) preference; + final TwoStatePreference switchPreference = (TwoStatePreference) preference; switchPreference.setEnabled(isUserControlAllowed()); } diff --git a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java index 40641812133..1519bf01940 100644 --- a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java +++ b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java @@ -29,7 +29,7 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.network.CarrierConfigCache; import com.android.settings.network.MobileDataEnabledListener; @@ -94,7 +94,7 @@ public class VideoCallingPreferenceController extends TelephonyTogglePreferenceC Log.d(TAG, "Skip update under mCallState=" + mCallState); return; } - final SwitchPreference switchPreference = (SwitchPreference) preference; + final TwoStatePreference switchPreference = (TwoStatePreference) preference; final boolean videoCallEnabled = isVideoCallEnabled(mSubId); switchPreference.setVisible(videoCallEnabled); if (videoCallEnabled) { diff --git a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java index 400d26101d2..36e2aa8e935 100644 --- a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java +++ b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java @@ -16,10 +16,6 @@ package com.android.settings.network.telephony.gsm; -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 static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; import android.app.ProgressDialog; @@ -44,7 +40,7 @@ import androidx.lifecycle.LifecycleEventObserver; import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.network.AllowedNetworkTypesListener; @@ -80,7 +76,7 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon @VisibleForTesting ProgressDialog mProgressDialog; @VisibleForTesting - SwitchPreference mSwitchPreference; + TwoStatePreference mSwitchPreference; private AtomicBoolean mUpdatingConfig; private int mCacheOfModeStatus; private AtomicLong mRecursiveUpdate; diff --git a/src/com/android/settings/network/tether/TetherSettings.java b/src/com/android/settings/network/tether/TetherSettings.java index 11887196c14..46cfb55ccf5 100644 --- a/src/com/android/settings/network/tether/TetherSettings.java +++ b/src/com/android/settings/network/tether/TetherSettings.java @@ -52,7 +52,7 @@ import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import androidx.lifecycle.ViewModelProvider; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; @@ -99,9 +99,9 @@ public class TetherSettings extends RestrictedSettingsFragment @VisibleForTesting RestrictedSwitchPreference mUsbTether; @VisibleForTesting - SwitchPreference mBluetoothTether; + TwoStatePreference mBluetoothTether; @VisibleForTesting - SwitchPreference mEthernetTether; + TwoStatePreference mEthernetTether; private BroadcastReceiver mTetherChangeReceiver; private BroadcastReceiver mBluetoothStateReceiver; @@ -247,8 +247,8 @@ public class TetherSettings extends RestrictedSettingsFragment @VisibleForTesting void setupTetherPreference() { mUsbTether = (RestrictedSwitchPreference) findPreference(KEY_USB_TETHER_SETTINGS); - mBluetoothTether = (SwitchPreference) findPreference(KEY_ENABLE_BLUETOOTH_TETHERING); - mEthernetTether = (SwitchPreference) findPreference(KEY_ENABLE_ETHERNET_TETHERING); + mBluetoothTether = (TwoStatePreference) findPreference(KEY_ENABLE_BLUETOOTH_TETHERING); + mEthernetTether = (TwoStatePreference) findPreference(KEY_ENABLE_ETHERNET_TETHERING); } @Override diff --git a/src/com/android/settings/nfc/ChangeNfcTagAppsStateDetails.java b/src/com/android/settings/nfc/ChangeNfcTagAppsStateDetails.java index 99c23cd98ad..305bbc10b58 100644 --- a/src/com/android/settings/nfc/ChangeNfcTagAppsStateDetails.java +++ b/src/com/android/settings/nfc/ChangeNfcTagAppsStateDetails.java @@ -24,7 +24,7 @@ import android.util.Log; import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; @@ -41,7 +41,7 @@ public class ChangeNfcTagAppsStateDetails extends AppInfoWithHeader private static final String LOG_TAG = "ChangeNfcTagAppsStateDetails"; private AppStateNfcTagAppsBridge mAppBridge; - private SwitchPreference mSwitchPref; + private TwoStatePreference mSwitchPref; @Override public void onCreate(Bundle savedInstanceState) { @@ -51,7 +51,7 @@ public class ChangeNfcTagAppsStateDetails extends AppInfoWithHeader // find preferences addPreferencesFromResource(R.xml.change_nfc_tag_apps_details); - mSwitchPref = (SwitchPreference) findPreference(KEY_APP_OPS_SETTINGS_SWITCH); + mSwitchPref = (TwoStatePreference) findPreference(KEY_APP_OPS_SETTINGS_SWITCH); // set title/summary for all of them mSwitchPref.setTitle(R.string.change_nfc_tag_apps_detail_switch); diff --git a/src/com/android/settings/nfc/SecureNfcEnabler.java b/src/com/android/settings/nfc/SecureNfcEnabler.java index ad5c4ab7e83..b02c9026a42 100644 --- a/src/com/android/settings/nfc/SecureNfcEnabler.java +++ b/src/com/android/settings/nfc/SecureNfcEnabler.java @@ -20,7 +20,7 @@ import android.content.Context; import android.nfc.NfcAdapter; import android.os.UserManager; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; @@ -30,10 +30,10 @@ import com.android.settings.R; * the current state. */ public class SecureNfcEnabler extends BaseNfcEnabler { - private final SwitchPreference mPreference; + private final TwoStatePreference mPreference; private final UserManager mUserManager; - public SecureNfcEnabler(Context context, SwitchPreference preference) { + public SecureNfcEnabler(Context context, TwoStatePreference preference) { super(context); mPreference = preference; mUserManager = context.getSystemService(UserManager.class); diff --git a/src/com/android/settings/nfc/SecureNfcPreferenceController.java b/src/com/android/settings/nfc/SecureNfcPreferenceController.java index 460eca3c142..03eed68823e 100644 --- a/src/com/android/settings/nfc/SecureNfcPreferenceController.java +++ b/src/com/android/settings/nfc/SecureNfcPreferenceController.java @@ -20,7 +20,7 @@ import android.nfc.NfcAdapter; import android.os.UserManager; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; @@ -49,7 +49,7 @@ public class SecureNfcPreferenceController extends TogglePreferenceController return; } - final SwitchPreference switchPreference = screen.findPreference(getPreferenceKey()); + final TwoStatePreference switchPreference = screen.findPreference(getPreferenceKey()); mSecureNfcEnabler = new SecureNfcEnabler(mContext, switchPreference); } diff --git a/src/com/android/settings/notification/BootSoundPreferenceController.java b/src/com/android/settings/notification/BootSoundPreferenceController.java index 2e7327df519..05bc259b60f 100644 --- a/src/com/android/settings/notification/BootSoundPreferenceController.java +++ b/src/com/android/settings/notification/BootSoundPreferenceController.java @@ -22,7 +22,7 @@ import android.os.SystemProperties; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -43,7 +43,7 @@ public class BootSoundPreferenceController extends AbstractPreferenceController public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); if (isAvailable()) { - SwitchPreference preference = screen.findPreference(KEY_BOOT_SOUNDS); + TwoStatePreference preference = screen.findPreference(KEY_BOOT_SOUNDS); preference.setChecked(SystemProperties.getBoolean(PROPERTY_BOOT_SOUNDS, true)); } } @@ -51,7 +51,7 @@ public class BootSoundPreferenceController extends AbstractPreferenceController @Override public boolean handlePreferenceTreeClick(Preference preference) { if (KEY_BOOT_SOUNDS.equals(preference.getKey())) { - SwitchPreference switchPreference = (SwitchPreference) preference; + TwoStatePreference switchPreference = (TwoStatePreference) preference; SystemProperties.set(PROPERTY_BOOT_SOUNDS, switchPreference.isChecked() ? "1" : "0"); } return false; diff --git a/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java b/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java index 40bae5d7918..2830024ff03 100644 --- a/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java +++ b/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java @@ -33,7 +33,7 @@ import androidx.lifecycle.LifecycleObserver; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; @@ -81,7 +81,7 @@ public class AppChannelsBypassingDndPreferenceController extends NotificationPre new Preference.OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference pref) { - SwitchPreference preference = (SwitchPreference) pref; + TwoStatePreference preference = (TwoStatePreference) pref; final boolean bypassDnd = preference.isChecked(); for (NotificationChannel channel : mChannels) { if (showNotification(channel) && isChannelConfigurable(channel)) { diff --git a/src/com/android/settings/notification/app/ChannelListPreferenceController.java b/src/com/android/settings/notification/app/ChannelListPreferenceController.java index 61ee02459a6..c9196336a68 100644 --- a/src/com/android/settings/notification/app/ChannelListPreferenceController.java +++ b/src/com/android/settings/notification/app/ChannelListPreferenceController.java @@ -34,7 +34,7 @@ import androidx.annotation.Nullable; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.Utils; @@ -313,7 +313,7 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr && isChannelGroupBlockable(group)); preference.setChecked(!group.isBlocked()); preference.setOnPreferenceClickListener(preference1 -> { - final boolean allowGroup = ((SwitchPreference) preference1).isChecked(); + final boolean allowGroup = ((TwoStatePreference) preference1).isChecked(); group.setBlocked(!allowGroup); mBackend.updateChannelGroup(mAppRow.pkg, mAppRow.uid, group); diff --git a/src/com/android/settings/notification/app/InvalidConversationInfoPreferenceController.java b/src/com/android/settings/notification/app/InvalidConversationInfoPreferenceController.java index b937e80e0d6..478607b193e 100644 --- a/src/com/android/settings/notification/app/InvalidConversationInfoPreferenceController.java +++ b/src/com/android/settings/notification/app/InvalidConversationInfoPreferenceController.java @@ -20,7 +20,6 @@ import android.app.NotificationChannel; import android.content.Context; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.notification.NotificationBackend; diff --git a/src/com/android/settings/notification/zen/ZenModeAlarmsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeAlarmsPreferenceController.java index 3d2a1b73893..85c35691eee 100644 --- a/src/com/android/settings/notification/zen/ZenModeAlarmsPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModeAlarmsPreferenceController.java @@ -23,7 +23,7 @@ import android.provider.Settings; import android.util.Log; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -51,7 +51,7 @@ public class ZenModeAlarmsPreferenceController extends public void updateState(Preference preference) { super.updateState(preference); - SwitchPreference pref = (SwitchPreference) preference; + TwoStatePreference pref = (TwoStatePreference) preference; switch (getZenMode()) { case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS: pref.setEnabled(false); diff --git a/src/com/android/settings/notification/zen/ZenModeEventsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeEventsPreferenceController.java index 080c31f5ca2..4716d76c1ea 100644 --- a/src/com/android/settings/notification/zen/ZenModeEventsPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModeEventsPreferenceController.java @@ -23,7 +23,7 @@ import android.provider.Settings; import android.util.Log; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -50,7 +50,7 @@ public class ZenModeEventsPreferenceController extends AbstractZenModePreference public void updateState(Preference preference) { super.updateState(preference); - SwitchPreference pref = (SwitchPreference) preference; + TwoStatePreference pref = (TwoStatePreference) preference; switch (getZenMode()) { case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS: case Settings.Global.ZEN_MODE_ALARMS: diff --git a/src/com/android/settings/notification/zen/ZenModeMediaPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeMediaPreferenceController.java index 51bceb178c0..f02ff752eb6 100644 --- a/src/com/android/settings/notification/zen/ZenModeMediaPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModeMediaPreferenceController.java @@ -22,7 +22,7 @@ import android.provider.Settings; import android.util.Log; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -51,7 +51,7 @@ public class ZenModeMediaPreferenceController extends AbstractZenModePreferenceC public void updateState(Preference preference) { super.updateState(preference); - SwitchPreference pref = (SwitchPreference) preference; + TwoStatePreference pref = (TwoStatePreference) preference; switch (getZenMode()) { case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS: pref.setEnabled(false); diff --git a/src/com/android/settings/notification/zen/ZenModeRemindersPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeRemindersPreferenceController.java index fede486a02e..f348e16d8b5 100644 --- a/src/com/android/settings/notification/zen/ZenModeRemindersPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModeRemindersPreferenceController.java @@ -23,7 +23,7 @@ import android.provider.Settings; import android.util.Log; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -50,7 +50,7 @@ public class ZenModeRemindersPreferenceController extends AbstractZenModePrefere public void updateState(Preference preference) { super.updateState(preference); - SwitchPreference pref = (SwitchPreference) preference; + TwoStatePreference pref = (TwoStatePreference) preference; switch (getZenMode()) { case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS: case Settings.Global.ZEN_MODE_ALARMS: diff --git a/src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceController.java index c015ed64fec..787691299f8 100644 --- a/src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceController.java @@ -24,7 +24,7 @@ import android.util.Log; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -65,7 +65,7 @@ public class ZenModeRepeatCallersPreferenceController extends AbstractZenModePre public void updateState(Preference preference) { super.updateState(preference); - SwitchPreference pref = (SwitchPreference) preference; + TwoStatePreference pref = (TwoStatePreference) preference; switch (getZenMode()) { case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS: case Settings.Global.ZEN_MODE_ALARMS: diff --git a/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java index 0e4f338773d..577416d4f97 100644 --- a/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java +++ b/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java @@ -31,12 +31,13 @@ import android.text.format.DateFormat; import android.util.Log; import android.widget.TimePicker; +import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -60,7 +61,8 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase { private Preference mDays; private TimePickerPreference mStart; private TimePickerPreference mEnd; - private SwitchPreference mExitAtAlarm; + @Nullable + private TwoStatePreference mExitAtAlarm = null; private AlertDialog mDayDialog; private ScheduleInfo mSchedule; @@ -135,7 +137,7 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase { root.addPreference(mEnd); mEnd.setDependency(mDays.getKey()); - mExitAtAlarm = (SwitchPreference) root.findPreference(KEY_EXIT_AT_ALARM); + mExitAtAlarm = root.findPreference(KEY_EXIT_AT_ALARM); mExitAtAlarm.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object o) { diff --git a/src/com/android/settings/notification/zen/ZenModeSystemPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeSystemPreferenceController.java index a170a782880..db88f82e8e0 100644 --- a/src/com/android/settings/notification/zen/ZenModeSystemPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModeSystemPreferenceController.java @@ -23,7 +23,7 @@ import android.provider.Settings; import android.util.Log; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -50,7 +50,7 @@ public class ZenModeSystemPreferenceController extends public void updateState(Preference preference) { super.updateState(preference); - SwitchPreference pref = (SwitchPreference) preference; + TwoStatePreference pref = (TwoStatePreference) preference; switch (getZenMode()) { case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS: pref.setEnabled(false); diff --git a/src/com/android/settings/notification/zen/ZenRuleCustomSwitchPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleCustomSwitchPreferenceController.java index e54a61495fb..a7bfd9dc34d 100644 --- a/src/com/android/settings/notification/zen/ZenRuleCustomSwitchPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenRuleCustomSwitchPreferenceController.java @@ -22,7 +22,7 @@ import android.util.Log; import android.util.Pair; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -47,7 +47,7 @@ public class ZenRuleCustomSwitchPreferenceController extends return; } - SwitchPreference pref = (SwitchPreference) preference; + TwoStatePreference pref = (TwoStatePreference) preference; pref.setChecked(mRule.getZenPolicy().isCategoryAllowed(mCategory, false)); } diff --git a/src/com/android/settings/notification/zen/ZenRuleRepeatCallersPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleRepeatCallersPreferenceController.java index b4eabbb949b..c5717f4ab27 100644 --- a/src/com/android/settings/notification/zen/ZenRuleRepeatCallersPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenRuleRepeatCallersPreferenceController.java @@ -23,7 +23,7 @@ import android.util.Pair; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -52,7 +52,7 @@ public class ZenRuleRepeatCallersPreferenceController extends return; } - SwitchPreference pref = (SwitchPreference) preference; + TwoStatePreference pref = (TwoStatePreference) preference; boolean anyCallersCanBypassDnd = mRule.getZenPolicy().getPriorityCallSenders() == ZenPolicy.PEOPLE_TYPE_ANYONE; diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java index ea80cb0dc75..20b640315be 100644 --- a/src/com/android/settings/security/ScreenPinningSettings.java +++ b/src/com/android/settings/security/ScreenPinningSettings.java @@ -33,7 +33,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; @@ -59,7 +59,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment private static final int CONFIRM_REQUEST = 1000; private SettingsMainSwitchBar mSwitchBar; - private SwitchPreference mUseScreenLock; + private TwoStatePreference mUseScreenLock; private FooterPreference mFooterPreference; private LockPatternUtils mLockPatternUtils; private UserManager mUserManager; diff --git a/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java index dcc6c22e86f..977959b1c3d 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java +++ b/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java @@ -34,7 +34,7 @@ import android.util.IconDrawableFactory; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.BasePreferenceController; @@ -172,7 +172,7 @@ public class TrustAgentsPreferenceController extends BasePreferenceController @Override public boolean onPreferenceChange(Preference preference, Object newValue) { - if (!(preference instanceof SwitchPreference)) { + if (!(preference instanceof TwoStatePreference)) { return false; } for (TrustAgentInfo agent : mAvailableAgents.values()) { diff --git a/src/com/android/settings/sim/smartForwarding/SmartForwardingFragment.java b/src/com/android/settings/sim/smartForwarding/SmartForwardingFragment.java index 76eaea111ba..a95eb38e784 100644 --- a/src/com/android/settings/sim/smartForwarding/SmartForwardingFragment.java +++ b/src/com/android/settings/sim/smartForwarding/SmartForwardingFragment.java @@ -27,7 +27,7 @@ import android.util.Log; import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settingslib.core.instrumentation.Instrumentable; @@ -51,7 +51,7 @@ public class SmartForwardingFragment extends PreferenceFragmentCompat String title = getResources().getString(R.string.smart_forwarding_title); getActivity().getActionBar().setTitle(title); - SwitchPreference smartForwardingSwitch = findPreference(KEY_SMART_FORWARDING_SWITCH); + TwoStatePreference smartForwardingSwitch = findPreference(KEY_SMART_FORWARDING_SWITCH); if (turnOffSwitch) { smartForwardingSwitch.setChecked(false); } @@ -93,7 +93,7 @@ public class SmartForwardingFragment extends PreferenceFragmentCompat } public void turnOnSwitchPreference() { - SwitchPreference smartForwardingSwitch = findPreference(KEY_SMART_FORWARDING_SWITCH); + TwoStatePreference smartForwardingSwitch = findPreference(KEY_SMART_FORWARDING_SWITCH); smartForwardingSwitch.setChecked(true); } diff --git a/src/com/android/settings/users/AutoSyncDataPreferenceController.java b/src/com/android/settings/users/AutoSyncDataPreferenceController.java index e3240c4bdcb..29c5c573eaf 100644 --- a/src/com/android/settings/users/AutoSyncDataPreferenceController.java +++ b/src/com/android/settings/users/AutoSyncDataPreferenceController.java @@ -31,7 +31,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -59,7 +59,7 @@ public class AutoSyncDataPreferenceController extends AbstractPreferenceControll @Override public void updateState(Preference preference) { - SwitchPreference switchPreference = (SwitchPreference) preference; + TwoStatePreference switchPreference = (TwoStatePreference) preference; switchPreference.setChecked(ContentResolver.getMasterSyncAutomaticallyAsUser( mUserHandle.getIdentifier())); } @@ -67,7 +67,7 @@ public class AutoSyncDataPreferenceController extends AbstractPreferenceControll @Override public boolean handlePreferenceTreeClick(Preference preference) { if (getPreferenceKey().equals(preference.getKey())) { - SwitchPreference switchPreference = (SwitchPreference) preference; + TwoStatePreference switchPreference = (TwoStatePreference) preference; boolean checked = switchPreference.isChecked(); switchPreference.setChecked(!checked); if (ActivityManager.isUserAMonkey()) { @@ -156,8 +156,8 @@ public class AutoSyncDataPreferenceController extends AbstractPreferenceControll Preference preference = ((PreferenceFragmentCompat) targetFragment).findPreference( arguments.getString(ARG_KEY)); - if (preference instanceof SwitchPreference) { - ((SwitchPreference) preference).setChecked(enabling); + if (preference instanceof TwoStatePreference) { + ((TwoStatePreference) preference).setChecked(enabling); } } } diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java index 16b39a7a213..a758e345325 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -32,7 +32,7 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -89,7 +89,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment @VisibleForTesting RestrictedPreference mSwitchUserPref; - private SwitchPreference mPhonePref; + private TwoStatePreference mPhonePref; @VisibleForTesting Preference mAppAndContentAccessPref; @VisibleForTesting @@ -97,7 +97,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment @VisibleForTesting Preference mRemoveUserPref; @VisibleForTesting - SwitchPreference mGrantAdminPref; + TwoStatePreference mGrantAdminPref; @VisibleForTesting /** The user being studied (not the user doing the studying). */ diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java index a1e2b050142..4ee229eb721 100644 --- a/src/com/android/settings/utils/ManagedServiceSettings.java +++ b/src/com/android/settings/utils/ManagedServiceSettings.java @@ -37,7 +37,7 @@ import android.view.View; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.Utils; @@ -121,7 +121,7 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings { } final CharSequence finalTitle = title; final String summary = service.loadLabel(mPm).toString(); - final SwitchPreference pref = new AppSwitchPreference(getPrefContext()); + final TwoStatePreference pref = new AppSwitchPreference(getPrefContext()); pref.setPersistent(false); pref.setIcon(mIconDrawableFactory.getBadgedIcon(service, service.applicationInfo, UserHandle.getUserId(service.applicationInfo.uid))); diff --git a/src/com/android/settings/wifi/ChangeWifiStateDetails.java b/src/com/android/settings/wifi/ChangeWifiStateDetails.java index 96cbce3bf80..9271100beb4 100644 --- a/src/com/android/settings/wifi/ChangeWifiStateDetails.java +++ b/src/com/android/settings/wifi/ChangeWifiStateDetails.java @@ -24,7 +24,7 @@ import android.os.Bundle; import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; @@ -41,7 +41,7 @@ public class ChangeWifiStateDetails extends AppInfoWithHeader private AppStateChangeWifiStateBridge mAppBridge; private AppOpsManager mAppOpsManager; - private SwitchPreference mSwitchPref; + private TwoStatePreference mSwitchPref; private WifiSettingsState mWifiSettingsState; @Override @@ -53,7 +53,7 @@ public class ChangeWifiStateDetails extends AppInfoWithHeader // find preferences addPreferencesFromResource(R.xml.change_wifi_state_details); - mSwitchPref = (SwitchPreference) findPreference(KEY_APP_OPS_SETTINGS_SWITCH); + mSwitchPref = (TwoStatePreference) findPreference(KEY_APP_OPS_SETTINGS_SWITCH); // set title/summary for all of them mSwitchPref.setTitle(R.string.change_wifi_state_app_detail_switch); diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java index df48129615e..e011eb85f1d 100644 --- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java +++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java @@ -31,7 +31,7 @@ import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; @@ -53,7 +53,7 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i private Fragment mFragment; @VisibleForTesting - SwitchPreference mPreference; + TwoStatePreference mPreference; @VisibleForTesting LocationManager mLocationManager; diff --git a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java index 701c72c5df9..58ad37bddcb 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java @@ -22,7 +22,7 @@ import android.net.wifi.WifiManager; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; @@ -56,7 +56,7 @@ public class WifiTetherAutoOffPreferenceController extends BasePreferenceControl SoftApConfiguration softApConfiguration = mWifiManager.getSoftApConfiguration(); mSettingsOn = softApConfiguration.isAutoShutdownEnabled(); - ((SwitchPreference) preference).setChecked(mSettingsOn); + ((TwoStatePreference) preference).setChecked(mSettingsOn); } @Override diff --git a/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java index 7a77d497acc..7f386fdeebc 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java @@ -22,7 +22,7 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; @@ -72,7 +72,7 @@ public class WifiTetherMaximizeCompatibilityPreferenceController extends return; } mPreference.setEnabled(is5GhzBandSupported()); - ((SwitchPreference) mPreference).setChecked(mIsChecked); + ((TwoStatePreference) mPreference).setChecked(mIsChecked); mPreference.setSummary(mWifiManager.isBridgedApConcurrencySupported() ? R.string.wifi_hotspot_maximize_compatibility_dual_ap_summary : R.string.wifi_hotspot_maximize_compatibility_single_ap_summary); |