From 8979681a8dd6f583cf40e892dcfc6882096dc257 Mon Sep 17 00:00:00 2001 From: Sebastian Pickl Date: Tue, 7 Nov 2023 13:26:36 +0000 Subject: [PATCH] Revert "Migrate to CompoundButton.OnCheckedChangeListener" Revert submission 25147565-onSwitchChanged-CompoundButton Reason for revert: breaking builds Bug:309601476 Reverted changes: /q/submissionid:25147565-onSwitchChanged-CompoundButton Change-Id: Ie746db87d9c642599593aa3d5e5baf6b7ba89c0e --- .../CaptioningTogglePreferenceController.java | 8 ++++---- ...AccessibilityServicePreferenceFragment.java | 4 ++-- .../ToggleFeaturePreferenceFragment.java | 8 ++++---- .../accounts/WorkModePreferenceController.java | 8 ++++---- .../intentpicker/AppLaunchSettings.java | 8 ++++---- .../AutoRestorePreferenceController.java | 4 ++-- .../backup/ToggleBackupSettingFragment.java | 4 +++- .../AudioSharingSwitchBarController.java | 10 +++++----- .../settings/datausage/DataSaverSummary.kt | 7 +++++-- ...maticStorageManagerSwitchBarController.java | 8 ++++---- .../DevelopmentSettingsDashboardFragment.java | 8 ++++---- ...toBrightnessDetailPreferenceController.java | 8 ++++---- ...tDisplayActivationPreferenceController.java | 8 ++++---- ...DarkModeActivationPreferenceController.java | 8 ++++---- .../android/settings/dream/DreamSettings.java | 8 ++++---- .../EmergencyGesturePreferenceController.java | 8 ++++---- .../fuelgauge/PowerBackgroundUsageDetail.java | 8 ++++---- ...eventRingingSwitchPreferenceController.java | 8 ++++---- .../inputmethod/SpellCheckersSettings.java | 8 ++++---- ...ScanningMainSwitchPreferenceController.java | 10 +++++----- .../location/LocationSwitchBarController.java | 8 ++++---- ...ScanningMainSwitchPreferenceController.java | 8 ++++---- .../MobileNetworkSwitchController.java | 2 +- .../settings/nfc/NfcPreferenceController.java | 8 ++++---- .../app/BlockPreferenceController.java | 8 ++++---- .../history/NotificationHistoryActivity.java | 4 ++-- ...utomaticRuleSwitchPreferenceController.java | 8 ++++---- .../print/PrintServiceSettingsFragment.java | 10 +++++----- .../security/ScreenPinningSettings.java | 8 ++++---- .../widget/MainSwitchBarController.java | 8 ++++---- .../settings/widget/SettingsMainSwitchBar.java | 8 +++++--- .../widget/SettingsMainSwitchPreference.java | 18 +++++++++--------- ...SettingsMainSwitchPreferenceController.java | 8 ++++---- .../calling/WifiCallingSettingsForSub.java | 8 ++++---- .../tether/WifiTetherSwitchBarController.java | 10 +++++----- ...ptioningTogglePreferenceControllerTest.java | 4 ++-- .../WorkModePreferenceControllerTest.java | 4 ++-- ...cStorageManagerSwitchBarControllerTest.java | 8 ++++---- ...velopmentSettingsDashboardFragmentTest.java | 8 ++++---- .../DevelopmentSwitchBarControllerTest.java | 8 ++++---- ...playActivationPreferenceControllerTest.java | 4 ++-- ...reamMainSwitchPreferenceControllerTest.java | 3 +++ .../PowerBackgroundUsageDetailTest.java | 8 ++++---- ...tRingingSwitchPreferenceControllerTest.java | 8 ++++---- .../LocationSwitchBarControllerTest.java | 4 ++-- ...leNotificationPreferenceControllerTest.java | 4 ++-- .../app/BlockPreferenceControllerTest.java | 10 +++++----- .../calling/WifiCallingSettingsForSubTest.java | 4 ++-- .../WifiTetherSwitchBarControllerTest.java | 10 +++++++--- 49 files changed, 188 insertions(+), 174 deletions(-) diff --git a/src/com/android/settings/accessibility/CaptioningTogglePreferenceController.java b/src/com/android/settings/accessibility/CaptioningTogglePreferenceController.java index 10e1fcae330..a9d2cdfafb9 100644 --- a/src/com/android/settings/accessibility/CaptioningTogglePreferenceController.java +++ b/src/com/android/settings/accessibility/CaptioningTogglePreferenceController.java @@ -17,18 +17,18 @@ package com.android.settings.accessibility; import android.content.Context; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.widget.SettingsMainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; /** Preference controller for captioning more options. */ public class CaptioningTogglePreferenceController extends TogglePreferenceController - implements OnCheckedChangeListener { + implements OnMainSwitchChangeListener { private final CaptionHelper mCaptionHelper; @@ -63,7 +63,7 @@ public class CaptioningTogglePreferenceController extends TogglePreferenceContro } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { if (isChecked != isChecked()) { setChecked(isChecked); } diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index 6847a6dc3c1..28b80baa32e 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -41,7 +41,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.View; import android.view.accessibility.AccessibilityManager; -import android.widget.CompoundButton; +import android.widget.Switch; import androidx.annotation.Nullable; @@ -294,7 +294,7 @@ public class ToggleAccessibilityServicePreferenceFragment extends } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { if (isChecked != isAccessibilityServiceEnabled()) { onPreferenceClick(isChecked); } diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index 427cad9df8d..3dc0b477e77 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -44,9 +44,8 @@ import android.view.ViewGroup; import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener; import android.widget.CheckBox; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.ImageView; +import android.widget.Switch; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; @@ -65,6 +64,7 @@ import com.android.settings.utils.LocaleUtils; import com.android.settings.widget.SettingsMainSwitchBar; import com.android.settings.widget.SettingsMainSwitchPreference; import com.android.settingslib.widget.IllustrationPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; import com.android.settingslib.widget.TopIntroPreference; import com.google.android.setupcompat.util.WizardManagerHelper; @@ -78,7 +78,7 @@ import java.util.Locale; * and dialog management. */ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment - implements ShortcutPreference.OnClickCallback, OnCheckedChangeListener { + implements ShortcutPreference.OnClickCallback, OnMainSwitchChangeListener { public static final String KEY_GENERAL_CATEGORY = "general_categories"; public static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference"; @@ -328,7 +328,7 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { onPreferenceToggled(mPreferenceKey, isChecked); } diff --git a/src/com/android/settings/accounts/WorkModePreferenceController.java b/src/com/android/settings/accounts/WorkModePreferenceController.java index ae910f7818d..46440f6690f 100644 --- a/src/com/android/settings/accounts/WorkModePreferenceController.java +++ b/src/com/android/settings/accounts/WorkModePreferenceController.java @@ -16,8 +16,7 @@ package com.android.settings.accounts; import android.content.Context; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.lifecycle.DefaultLifecycleObserver; import androidx.lifecycle.LifecycleOwner; @@ -28,13 +27,14 @@ import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.slices.SliceData; import com.android.settingslib.widget.MainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; import org.jetbrains.annotations.NotNull; /** Controller for "Work apps" toggle that allows the user to enable/disable quiet mode. */ public class WorkModePreferenceController extends BasePreferenceController - implements OnCheckedChangeListener, DefaultLifecycleObserver, + implements OnMainSwitchChangeListener, DefaultLifecycleObserver, ManagedProfileQuietModeEnabler.QuietModeChangeListener { private final ManagedProfileQuietModeEnabler mQuietModeEnabler; @@ -68,7 +68,7 @@ public class WorkModePreferenceController extends BasePreferenceController } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { mQuietModeEnabler.setQuietModeEnabled(!isChecked); } diff --git a/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java b/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java index 72f754379aa..cebb4f78689 100644 --- a/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java +++ b/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java @@ -35,8 +35,7 @@ import android.util.ArraySet; import android.util.Log; import android.view.LayoutInflater; import android.view.View; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import android.widget.TextView; import androidx.annotation.VisibleForTesting; @@ -52,6 +51,7 @@ import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.MainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; import java.util.HashMap; import java.util.List; @@ -62,7 +62,7 @@ import java.util.UUID; /** The page of the Open by default */ public class AppLaunchSettings extends AppInfoBase implements - Preference.OnPreferenceChangeListener, OnCheckedChangeListener { + Preference.OnPreferenceChangeListener, OnMainSwitchChangeListener { private static final String TAG = "AppLaunchSettings"; // Preference keys private static final String MAIN_SWITCH_PREF_KEY = "open_by_default_supported_links"; @@ -168,7 +168,7 @@ public class AppLaunchSettings extends AppInfoBase implements } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { IntentPickerUtils.logd("onSwitchChanged: isChecked=" + isChecked); if (mMainSwitchPreference != null) { //mMainSwitchPreference synced with Switch mMainSwitchPreference.setChecked(isChecked); diff --git a/src/com/android/settings/backup/AutoRestorePreferenceController.java b/src/com/android/settings/backup/AutoRestorePreferenceController.java index 1394ce13619..bf63e25b522 100644 --- a/src/com/android/settings/backup/AutoRestorePreferenceController.java +++ b/src/com/android/settings/backup/AutoRestorePreferenceController.java @@ -25,7 +25,7 @@ import android.provider.Settings; import android.util.Log; import androidx.preference.Preference; -import androidx.preference.TwoStatePreference; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; @@ -79,7 +79,7 @@ public class AutoRestorePreferenceController extends TogglePreferenceController backupManager.setAutoRestore(nextValue); result = true; } catch (RemoteException e) { - ((TwoStatePreference) mPreference).setChecked(!nextValue); + ((SwitchPreference) mPreference).setChecked(!nextValue); Log.e(TAG, "Error can't set setAutoRestore", e); } diff --git a/src/com/android/settings/backup/ToggleBackupSettingFragment.java b/src/com/android/settings/backup/ToggleBackupSettingFragment.java index c3ad92fe23b..8f60be9a1cf 100644 --- a/src/com/android/settings/backup/ToggleBackupSettingFragment.java +++ b/src/com/android/settings/backup/ToggleBackupSettingFragment.java @@ -11,6 +11,7 @@ import android.os.ServiceManager; import android.provider.Settings; import android.util.Log; import android.view.View; +import android.widget.Switch; import android.widget.TextView; import androidx.appcompat.app.AlertDialog; @@ -115,7 +116,8 @@ public class ToggleBackupSettingFragment extends SettingsPreferenceFragment mSwitchBar.setOnBeforeCheckedChangeListener( new SettingsMainSwitchBar.OnBeforeCheckedChangeListener() { @Override - public boolean onBeforeCheckedChanged(boolean checked) { + public boolean onBeforeCheckedChanged( + Switch toggleSwitch, boolean checked) { if (!checked) { // Don't change Switch status until user makes choice in dialog // so return true here. diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java index 83367ae9c11..ff383a7269d 100644 --- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java +++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java @@ -25,8 +25,7 @@ import android.bluetooth.BluetoothLeBroadcastReceiveState; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.util.Log; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.annotation.NonNull; import androidx.lifecycle.DefaultLifecycleObserver; @@ -43,6 +42,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast; import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.utils.ThreadUtils; +import com.android.settingslib.widget.OnMainSwitchChangeListener; import com.google.common.collect.ImmutableList; @@ -55,7 +55,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; public class AudioSharingSwitchBarController extends BasePreferenceController - implements DefaultLifecycleObserver, OnCheckedChangeListener { + implements DefaultLifecycleObserver, OnMainSwitchChangeListener { private static final String TAG = "AudioSharingSwitchBarCtl"; private static final String PREF_KEY = "audio_sharing_main_switch"; private final SettingsMainSwitchBar mSwitchBar; @@ -229,9 +229,9 @@ public class AudioSharingSwitchBarController extends BasePreferenceController } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { // Filter out unnecessary callbacks when switch is disabled. - if (!buttonView.isEnabled()) return; + if (!switchView.isEnabled()) return; if (isChecked) { startAudioSharing(); } else { diff --git a/src/com/android/settings/datausage/DataSaverSummary.kt b/src/com/android/settings/datausage/DataSaverSummary.kt index cdd46f2fa40..0828d362410 100644 --- a/src/com/android/settings/datausage/DataSaverSummary.kt +++ b/src/com/android/settings/datausage/DataSaverSummary.kt @@ -19,6 +19,7 @@ import android.app.settings.SettingsEnums import android.content.Context import android.os.Bundle import android.telephony.SubscriptionManager +import android.widget.Switch import com.android.settings.R import com.android.settings.SettingsActivity import com.android.settings.dashboard.DashboardFragment @@ -50,7 +51,9 @@ class DataSaverSummary : DashboardFragment() { switchBar = (activity as SettingsActivity).switchBar.apply { setTitle(getString(R.string.data_saver_switch_title)) show() - addOnSwitchChangeListener { _, isChecked -> onSwitchChanged(isChecked) } + addOnSwitchChangeListener { _: Switch, isChecked: Boolean -> + onSwitchChanged(isChecked) + } } } @@ -102,4 +105,4 @@ class DataSaverSummary : DashboardFragment() { SubscriptionManager.INVALID_SUBSCRIPTION_ID) } } -} +} \ No newline at end of file diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java index a8cb9ad00ab..f46bb0d18c9 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java @@ -20,8 +20,7 @@ import android.app.settings.SettingsEnums; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; @@ -30,10 +29,11 @@ import com.android.internal.util.Preconditions; import com.android.settings.widget.SettingsMainSwitchBar; import com.android.settingslib.Utils; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import com.android.settingslib.widget.OnMainSwitchChangeListener; /** Handles the logic for flipping the storage management toggle on a {@link SwitchBar}. */ public class AutomaticStorageManagerSwitchBarController - implements OnCheckedChangeListener { + implements OnMainSwitchChangeListener { private static final String STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY = "ro.storage_manager.enabled"; @@ -64,7 +64,7 @@ public class AutomaticStorageManagerSwitchBarController } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { mMetrics.action(mContext, SettingsEnums.ACTION_TOGGLE_STORAGE_MANAGER, isChecked); mDaysToRetainPreference.setEnabled(isChecked); Settings.Secure.putInt( diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 9c8c186675b..a995ac3c2fd 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -45,8 +45,7 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.annotation.VisibleForTesting; import androidx.localbroadcastmanager.content.LocalBroadcastManager; @@ -81,6 +80,7 @@ import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.development.SystemPropPoker; import com.android.settingslib.search.SearchIndexable; +import com.android.settingslib.widget.OnMainSwitchChangeListener; import com.google.android.setupcompat.util.WizardManagerHelper; @@ -89,7 +89,7 @@ import java.util.List; @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment - implements OnCheckedChangeListener, OemUnlockDialogHost, AdbDialogHost, + implements OnMainSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost, AdbClearKeysDialogHost, LogPersistDialogHost, BluetoothRebootDialog.OnRebootDialogListener, AbstractBluetoothPreferenceController.Callback, @@ -333,7 +333,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { final boolean developmentEnabledState = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(getContext()); if (isChecked != developmentEnabledState) { diff --git a/src/com/android/settings/display/AutoBrightnessDetailPreferenceController.java b/src/com/android/settings/display/AutoBrightnessDetailPreferenceController.java index 9bfb2f4e222..ec311f400f2 100644 --- a/src/com/android/settings/display/AutoBrightnessDetailPreferenceController.java +++ b/src/com/android/settings/display/AutoBrightnessDetailPreferenceController.java @@ -17,18 +17,18 @@ package com.android.settings.display; import android.content.Context; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.preference.PreferenceScreen; import com.android.settings.widget.SettingsMainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; /** * Controller that updates the adaptive brightness. */ public class AutoBrightnessDetailPreferenceController extends - AutoBrightnessPreferenceController implements OnCheckedChangeListener { + AutoBrightnessPreferenceController implements OnMainSwitchChangeListener { public AutoBrightnessDetailPreferenceController(Context context, String key) { super(context, key); @@ -58,7 +58,7 @@ public class AutoBrightnessDetailPreferenceController extends } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { if (isChecked != isChecked()) { setChecked(isChecked); } diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java index fd6d199a29d..c94f44331dc 100644 --- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java @@ -19,8 +19,7 @@ package com.android.settings.display; import android.content.Context; import android.hardware.display.ColorDisplayManager; import android.text.TextUtils; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -30,12 +29,13 @@ import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.widget.MainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; /** * Controller that updates the night display. */ public class NightDisplayActivationPreferenceController extends - TogglePreferenceController implements OnCheckedChangeListener { + TogglePreferenceController implements OnMainSwitchChangeListener { private final MetricsFeatureProvider mMetricsFeatureProvider; private ColorDisplayManager mColorDisplayManager; @@ -81,7 +81,7 @@ public class NightDisplayActivationPreferenceController extends } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { final boolean activated = mColorDisplayManager.isNightDisplayActivated(); if (isChecked != activated) { // TODO(b/179017365): Create a controller which extends TogglePreferenceController to diff --git a/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java b/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java index 5f441be79b8..eac714bf5c3 100644 --- a/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java +++ b/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java @@ -18,8 +18,7 @@ package com.android.settings.display.darkmode; import android.app.UiModeManager; import android.content.Context; import android.content.res.Configuration; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -29,6 +28,7 @@ import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.widget.MainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; import java.time.LocalTime; @@ -36,7 +36,7 @@ import java.time.LocalTime; * Controller for activate/deactivate night mode button */ public class DarkModeActivationPreferenceController extends BasePreferenceController implements - OnCheckedChangeListener { + OnMainSwitchChangeListener { private final UiModeManager mUiModeManager; private final MetricsFeatureProvider mMetricsFeatureProvider; @@ -96,7 +96,7 @@ public class DarkModeActivationPreferenceController extends BasePreferenceContro } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { mMetricsFeatureProvider.logClickedPreference(mPreference, getMetricsCategory()); final boolean active = (mContext.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) != 0; diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java index 418bb6418c1..25825eac4f7 100644 --- a/src/com/android/settings/dream/DreamSettings.java +++ b/src/com/android/settings/dream/DreamSettings.java @@ -29,8 +29,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; @@ -45,12 +44,13 @@ import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.WhenToDream; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.widget.MainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; import java.util.ArrayList; import java.util.List; @SearchIndexable -public class DreamSettings extends DashboardFragment implements OnCheckedChangeListener { +public class DreamSettings extends DashboardFragment implements OnMainSwitchChangeListener { private static final String TAG = "DreamSettings"; static final String WHILE_CHARGING_ONLY = "while_charging_only"; @@ -246,7 +246,7 @@ public class DreamSettings extends DashboardFragment implements OnCheckedChangeL } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { setAllPreferencesEnabled(isChecked); mPreviewButton.setVisibility(isChecked ? View.VISIBLE : View.GONE); updatePaddingForPreviewButton(); diff --git a/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java b/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java index b222cc170c7..b6135ab2740 100644 --- a/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java +++ b/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java @@ -17,8 +17,7 @@ package com.android.settings.emergency; import android.content.Context; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; @@ -28,12 +27,13 @@ import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.emergencynumber.EmergencyNumberUtils; import com.android.settingslib.widget.MainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; /** * Preference controller for emergency gesture setting */ public class EmergencyGesturePreferenceController extends BasePreferenceController implements - OnCheckedChangeListener { + OnMainSwitchChangeListener { @VisibleForTesting EmergencyNumberUtils mEmergencyNumberUtils; @@ -72,7 +72,7 @@ public class EmergencyGesturePreferenceController extends BasePreferenceControll } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { mEmergencyNumberUtils.setEmergencyGestureEnabled(isChecked); } } diff --git a/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java b/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java index 28ae04fc721..664d916cb40 100644 --- a/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java @@ -28,8 +28,7 @@ import android.os.UserHandle; import android.text.TextUtils; import android.util.Log; import android.view.View; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.annotation.VisibleForTesting; @@ -45,6 +44,7 @@ import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.LayoutPreference; import com.android.settingslib.widget.MainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; import com.android.settingslib.widget.SelectorWithWidgetPreference; import java.util.ArrayList; @@ -54,7 +54,7 @@ import java.util.concurrent.Executors; /** Allow background usage fragment for each app */ public class PowerBackgroundUsageDetail extends DashboardFragment - implements SelectorWithWidgetPreference.OnClickListener, OnCheckedChangeListener { + implements SelectorWithWidgetPreference.OnClickListener, OnMainSwitchChangeListener { private static final String TAG = "PowerBackgroundUsageDetail"; public static final String EXTRA_UID = "extra_uid"; @@ -155,7 +155,7 @@ public class PowerBackgroundUsageDetail extends DashboardFragment } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { mMainSwitchPreference.setChecked(isChecked); updateSelectorPreference(isChecked); } diff --git a/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java b/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java index 9c0e0bffae7..642623a80c3 100644 --- a/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java +++ b/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java @@ -18,8 +18,7 @@ package com.android.settings.gestures; import android.content.Context; import android.provider.Settings; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; @@ -29,9 +28,10 @@ import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.widget.MainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; public class PreventRingingSwitchPreferenceController extends AbstractPreferenceController - implements PreferenceControllerMixin, OnCheckedChangeListener { + implements PreferenceControllerMixin, OnMainSwitchChangeListener { private static final String KEY = "gesture_prevent_ringing_switch"; private final Context mContext; @@ -94,7 +94,7 @@ public class PreventRingingSwitchPreferenceController extends AbstractPreference } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { final int preventRingingSetting = Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_VIBRATE); final int newRingingSetting = preventRingingSetting == Settings.Secure.VOLUME_HUSH_OFF diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java index bcb527bb6d6..a58d10ccf99 100644 --- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java +++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java @@ -26,8 +26,7 @@ import android.util.Log; import android.view.textservice.SpellCheckerInfo; import android.view.textservice.SpellCheckerSubtype; import android.view.textservice.TextServicesManager; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; @@ -38,9 +37,10 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.widget.SettingsMainSwitchBar; +import com.android.settingslib.widget.OnMainSwitchChangeListener; public class SpellCheckersSettings extends SettingsPreferenceFragment - implements OnCheckedChangeListener, OnPreferenceChangeListener { + implements OnMainSwitchChangeListener, OnPreferenceChangeListener { private static final String TAG = SpellCheckersSettings.class.getSimpleName(); private static final boolean DBG = false; @@ -105,7 +105,7 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment } @Override - public void onCheckedChanged(final CompoundButton buttonView, final boolean isChecked) { + public void onSwitchChanged(final Switch switchView, final boolean isChecked) { Settings.Secure.putInt(getContentResolver(), Settings.Secure.SPELL_CHECKER_ENABLED, isChecked ? 1 : 0); updatePreferenceScreen(); diff --git a/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java b/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java index c975a410be1..78e31848acb 100644 --- a/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java +++ b/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java @@ -16,22 +16,22 @@ package com.android.settings.location; import android.content.Context; -import android.os.UserManager; import android.provider.Settings; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; +import android.os.UserManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.widget.MainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; /** * Preference controller for Bluetooth scanning main switch. */ public class BluetoothScanningMainSwitchPreferenceController extends TogglePreferenceController - implements OnCheckedChangeListener { + implements OnMainSwitchChangeListener { private static final String KEY_BLUETOOTH_SCANNING_SWITCH = "bluetooth_always_scanning_switch"; private final UserManager mUserManager; @@ -78,7 +78,7 @@ public class BluetoothScanningMainSwitchPreferenceController extends TogglePrefe } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { if (isChecked != isChecked()) { setChecked(isChecked); } diff --git a/src/com/android/settings/location/LocationSwitchBarController.java b/src/com/android/settings/location/LocationSwitchBarController.java index 1e415d68f8d..b150b1d93c0 100644 --- a/src/com/android/settings/location/LocationSwitchBarController.java +++ b/src/com/android/settings/location/LocationSwitchBarController.java @@ -16,8 +16,7 @@ package com.android.settings.location; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import com.android.settings.widget.SettingsMainSwitchBar; import com.android.settingslib.RestrictedLockUtils; @@ -25,11 +24,12 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import com.android.settingslib.widget.OnMainSwitchChangeListener; /** * The switch controller for the location. */ -public class LocationSwitchBarController implements OnCheckedChangeListener, +public class LocationSwitchBarController implements OnMainSwitchChangeListener, LocationEnabler.LocationModeChangeListener, LifecycleObserver, OnStart, OnStop { private final SettingsMainSwitchBar mSwitchBar; @@ -100,7 +100,7 @@ public class LocationSwitchBarController implements OnCheckedChangeListener, * Listens to the state change of the location primary switch. */ @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { mLocationEnabler.setLocationEnabled(isChecked); } } diff --git a/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java b/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java index 9f19a703e65..e22b0a08026 100644 --- a/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java +++ b/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java @@ -17,21 +17,21 @@ package com.android.settings.location; import android.content.Context; import android.net.wifi.WifiManager; +import android.widget.Switch; import android.os.UserManager; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.widget.MainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; /** * Preference controller for Wi-Fi scanning main switch. */ public class WifiScanningMainSwitchPreferenceController extends TogglePreferenceController - implements OnCheckedChangeListener { + implements OnMainSwitchChangeListener { private static final String KEY_WIFI_SCANNING_SWITCH = "wifi_always_scanning_switch"; private final WifiManager mWifiManager; @@ -79,7 +79,7 @@ public class WifiScanningMainSwitchPreferenceController extends TogglePreference } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { if (isChecked != isChecked()) { setChecked(isChecked); } diff --git a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java index 20a3d8921f7..453941d706c 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java @@ -86,7 +86,7 @@ public class MobileNetworkSwitchController extends BasePreferenceController impl super.displayPreference(screen); mSwitchBar = (SettingsMainSwitchPreference) screen.findPreference(mPreferenceKey); - mSwitchBar.setOnBeforeCheckedChangeListener((isChecked) -> { + mSwitchBar.setOnBeforeCheckedChangeListener((toggleSwitch, isChecked) -> { // TODO b/135222940: re-evaluate whether to use // mSubscriptionManager#isSubscriptionEnabled if (mSubscriptionManager.isActiveSubscriptionId(mSubId) != isChecked) { diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java index 4d750042919..2ba00c6670a 100644 --- a/src/com/android/settings/nfc/NfcPreferenceController.java +++ b/src/com/android/settings/nfc/NfcPreferenceController.java @@ -22,8 +22,7 @@ import android.content.IntentFilter; import android.net.Uri; import android.nfc.NfcAdapter; import android.util.Log; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.preference.PreferenceScreen; @@ -34,11 +33,12 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.widget.MainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; import java.io.IOException; public class NfcPreferenceController extends TogglePreferenceController - implements LifecycleObserver, OnResume, OnPause, OnCheckedChangeListener { + implements LifecycleObserver, OnResume, OnPause, OnMainSwitchChangeListener { public static final String KEY_TOGGLE_NFC = "toggle_nfc"; private final NfcAdapter mNfcAdapter; @@ -64,7 +64,7 @@ public class NfcPreferenceController extends TogglePreferenceController } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { if (isChecked != mNfcAdapter.isEnabled()) { setChecked(isChecked); } diff --git a/src/com/android/settings/notification/app/BlockPreferenceController.java b/src/com/android/settings/notification/app/BlockPreferenceController.java index a3d0a730ced..f4e213298a7 100644 --- a/src/com/android/settings/notification/app/BlockPreferenceController.java +++ b/src/com/android/settings/notification/app/BlockPreferenceController.java @@ -23,8 +23,7 @@ import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.preference.Preference; @@ -32,9 +31,10 @@ import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.notification.NotificationBackend; import com.android.settings.widget.SettingsMainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; public class BlockPreferenceController extends NotificationPreferenceController - implements PreferenceControllerMixin, OnCheckedChangeListener { + implements PreferenceControllerMixin, OnMainSwitchChangeListener { private static final String KEY_BLOCK = "block"; private NotificationSettings.DependentFieldListener mDependentFieldListener; @@ -104,7 +104,7 @@ public class BlockPreferenceController extends NotificationPreferenceController } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { boolean blocked = !isChecked; if (mChannel != null) { final int originalImportance = mChannel.getImportance(); diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java index 4616934e684..4808773f52e 100644 --- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java +++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java @@ -47,7 +47,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.ViewOutlineProvider; -import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.ImageView; import android.widget.TextView; @@ -65,6 +64,7 @@ import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity; import com.android.settingslib.utils.StringUtil; import com.android.settingslib.utils.ThreadUtils; import com.android.settingslib.widget.MainSwitchBar; +import com.android.settingslib.widget.OnMainSwitchChangeListener; import java.util.ArrayList; import java.util.Arrays; @@ -355,7 +355,7 @@ public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity { mHistoryEmpty.setVisibility(View.GONE); } - private final OnCheckedChangeListener mOnSwitchClickListener = + private final OnMainSwitchChangeListener mOnSwitchClickListener = (switchView, isChecked) -> { int oldState = 0; try { diff --git a/src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java b/src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java index 4d2a6a58d6c..fa36dde5171 100644 --- a/src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java @@ -18,8 +18,7 @@ package com.android.settings.notification.zen; import android.app.AutomaticZenRule; import android.content.Context; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.fragment.app.Fragment; import androidx.preference.Preference; @@ -28,10 +27,11 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.MainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; public class ZenAutomaticRuleSwitchPreferenceController extends AbstractZenModeAutomaticRulePreferenceController implements - OnCheckedChangeListener { + OnMainSwitchChangeListener { private static final String KEY = "zen_automatic_rule_switch"; private AutomaticZenRule mRule; @@ -86,7 +86,7 @@ public class ZenAutomaticRuleSwitchPreferenceController extends } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { final boolean enabled = isChecked; if (enabled == mRule.isEnabled()) return; mRule.setEnabled(enabled); diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java index e144ffdd3c9..c5316e6e524 100644 --- a/src/com/android/settings/print/PrintServiceSettingsFragment.java +++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java @@ -43,13 +43,12 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.view.accessibility.AccessibilityManager; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.Filter; import android.widget.Filterable; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.SearchView; +import android.widget.Switch; import android.widget.TextView; import androidx.annotation.NonNull; @@ -62,6 +61,7 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.widget.SettingsMainSwitchBar; +import com.android.settingslib.widget.OnMainSwitchChangeListener; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -72,7 +72,7 @@ import java.util.Map; * Fragment with print service settings. */ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment - implements OnCheckedChangeListener, + implements OnMainSwitchChangeListener, LoaderManager.LoaderCallbacks> { private static final String LOG_TAG = "PrintServiceSettings"; @@ -240,7 +240,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment mSwitchBar.addOnSwitchChangeListener(this); mSwitchBar.show(); - mSwitchBar.setOnBeforeCheckedChangeListener((checked) -> { + mSwitchBar.setOnBeforeCheckedChangeListener((toggleSwitch, checked) -> { onPreferenceToggled(mPreferenceKey, checked); return false; }); @@ -250,7 +250,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { updateEmptyView(); } diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java index 99d6492d1b9..20b640315be 100644 --- a/src/com/android/settings/security/ScreenPinningSettings.java +++ b/src/com/android/settings/security/ScreenPinningSettings.java @@ -27,8 +27,7 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; @@ -46,12 +45,13 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.widget.SettingsMainSwitchBar; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.widget.FooterPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; /** * Screen pinning settings. */ @SearchIndexable public class ScreenPinningSettings extends SettingsPreferenceFragment - implements OnCheckedChangeListener, DialogInterface.OnClickListener { + implements OnMainSwitchChangeListener, DialogInterface.OnClickListener { private static final String KEY_USE_SCREEN_LOCK = "use_screen_lock"; private static final String KEY_FOOTER = "screen_pinning_settings_screen_footer"; @@ -198,7 +198,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment * Listens to the state change of the overall lock-to-app switch. */ @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { if (isChecked) { new AlertDialog.Builder(getContext()) .setMessage(R.string.screen_pinning_dialog_message) diff --git a/src/com/android/settings/widget/MainSwitchBarController.java b/src/com/android/settings/widget/MainSwitchBarController.java index 455da94c43b..8aa5c9b5db9 100644 --- a/src/com/android/settings/widget/MainSwitchBarController.java +++ b/src/com/android/settings/widget/MainSwitchBarController.java @@ -16,16 +16,16 @@ package com.android.settings.widget; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import com.android.settingslib.RestrictedLockUtils; +import com.android.settingslib.widget.OnMainSwitchChangeListener; /** * The switch controller that is used to update the switch widget in the SettingsMainSwitchBar. */ public class MainSwitchBarController extends SwitchWidgetController implements - OnCheckedChangeListener { + OnMainSwitchChangeListener { private final SettingsMainSwitchBar mMainSwitch; @@ -74,7 +74,7 @@ public class MainSwitchBarController extends SwitchWidgetController implements } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { if (mListener != null) { mListener.onSwitchToggled(isChecked); } diff --git a/src/com/android/settings/widget/SettingsMainSwitchBar.java b/src/com/android/settings/widget/SettingsMainSwitchBar.java index e8c6fc9b0b9..ac2c136e8a1 100644 --- a/src/com/android/settings/widget/SettingsMainSwitchBar.java +++ b/src/com/android/settings/widget/SettingsMainSwitchBar.java @@ -21,6 +21,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import android.content.Context; import android.util.AttributeSet; import android.view.View; +import android.widget.Switch; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.RestrictedLockUtils; @@ -38,9 +39,10 @@ public class SettingsMainSwitchBar extends MainSwitchBar { public interface OnBeforeCheckedChangeListener { /** - * @param isChecked The new checked state of switchView. + * @param switchView The Switch view whose state has changed. + * @param isChecked The new checked state of switchView. */ - boolean onBeforeCheckedChanged(boolean isChecked); + boolean onBeforeCheckedChanged(Switch switchView, boolean isChecked); } private EnforcedAdmin mEnforcedAdmin; @@ -115,7 +117,7 @@ public class SettingsMainSwitchBar extends MainSwitchBar { @Override public void setChecked(boolean checked) { if (mOnBeforeListener != null - && mOnBeforeListener.onBeforeCheckedChanged(checked)) { + && mOnBeforeListener.onBeforeCheckedChanged(mSwitch, checked)) { return; } super.setChecked(checked); diff --git a/src/com/android/settings/widget/SettingsMainSwitchPreference.java b/src/com/android/settings/widget/SettingsMainSwitchPreference.java index fc43e585106..ba17c856999 100644 --- a/src/com/android/settings/widget/SettingsMainSwitchPreference.java +++ b/src/com/android/settings/widget/SettingsMainSwitchPreference.java @@ -20,8 +20,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import android.content.Context; import android.util.AttributeSet; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.preference.PreferenceViewHolder; import androidx.preference.TwoStatePreference; @@ -30,6 +29,7 @@ import com.android.settings.R; import com.android.settings.widget.SettingsMainSwitchBar.OnBeforeCheckedChangeListener; import com.android.settingslib.RestrictedPreferenceHelper; import com.android.settingslib.core.instrumentation.SettingsJankMonitor; +import com.android.settingslib.widget.OnMainSwitchChangeListener; import java.util.ArrayList; import java.util.List; @@ -40,11 +40,11 @@ import java.util.List; * to enable or disable the preferences on the page. */ public class SettingsMainSwitchPreference extends TwoStatePreference implements - OnCheckedChangeListener { + OnMainSwitchChangeListener { private final List mBeforeCheckedChangeListeners = new ArrayList<>(); - private final List mSwitchChangeListeners = new ArrayList<>(); + private final List mSwitchChangeListeners = new ArrayList<>(); private SettingsMainSwitchBar mMainSwitchBar; private EnforcedAdmin mEnforcedAdmin; @@ -127,9 +127,9 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { super.setChecked(isChecked); - SettingsJankMonitor.detectToggleJank(getKey(), buttonView); + SettingsJankMonitor.detectToggleJank(getKey(), switchView); } /** @@ -197,7 +197,7 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements /** * Adds a listener for switch changes */ - public void addOnSwitchChangeListener(OnCheckedChangeListener listener) { + public void addOnSwitchChangeListener(OnMainSwitchChangeListener listener) { if (!mSwitchChangeListeners.contains(listener)) { mSwitchChangeListeners.add(listener); } @@ -209,7 +209,7 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements /** * Remove a listener for switch changes */ - public void removeOnSwitchChangeListener(OnCheckedChangeListener listener) { + public void removeOnSwitchChangeListener(OnMainSwitchChangeListener listener) { mSwitchChangeListeners.remove(listener); if (mMainSwitchBar != null) { mMainSwitchBar.removeOnSwitchChangeListener(listener); @@ -239,7 +239,7 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements for (OnBeforeCheckedChangeListener listener : mBeforeCheckedChangeListeners) { mMainSwitchBar.setOnBeforeCheckedChangeListener(listener); } - for (OnCheckedChangeListener listener : mSwitchChangeListeners) { + for (OnMainSwitchChangeListener listener : mSwitchChangeListeners) { mMainSwitchBar.addOnSwitchChangeListener(listener); } } diff --git a/src/com/android/settings/widget/SettingsMainSwitchPreferenceController.java b/src/com/android/settings/widget/SettingsMainSwitchPreferenceController.java index 60e3388b264..5fa9259ab9e 100644 --- a/src/com/android/settings/widget/SettingsMainSwitchPreferenceController.java +++ b/src/com/android/settings/widget/SettingsMainSwitchPreferenceController.java @@ -17,20 +17,20 @@ package com.android.settings.widget; import android.content.Context; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.widget.MainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; /** * Preference controller for MainSwitchPreference. */ public abstract class SettingsMainSwitchPreferenceController extends - TogglePreferenceController implements OnCheckedChangeListener { + TogglePreferenceController implements OnMainSwitchChangeListener { protected MainSwitchPreference mSwitchPreference; @@ -49,7 +49,7 @@ public abstract class SettingsMainSwitchPreferenceController extends } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { mSwitchPreference.setChecked(isChecked); setChecked(isChecked); } diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java index 739f8b25b23..650536e52e6 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java @@ -38,8 +38,7 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; @@ -56,6 +55,7 @@ import com.android.settings.Utils; import com.android.settings.core.SubSettingLauncher; import com.android.settings.network.ims.WifiCallingQueryImsState; import com.android.settings.widget.SettingsMainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; import java.util.List; @@ -64,7 +64,7 @@ import java.util.List; * The preference screen lets you enable/disable Wi-Fi Calling and change Wi-Fi Calling mode. */ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment - implements OnCheckedChangeListener, + implements OnMainSwitchChangeListener, Preference.OnPreferenceChangeListener { private static final String TAG = "WifiCallingForSub"; @@ -463,7 +463,7 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment * Listens to the state change of the switch. */ @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { Log.d(TAG, "onSwitchChanged(" + isChecked + ")"); if (!isChecked) { diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java index 9febba3b7d0..75a37898035 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java @@ -32,8 +32,7 @@ import android.net.wifi.WifiManager; import android.os.Handler; import android.os.Looper; import android.util.Log; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.Switch; import androidx.annotation.VisibleForTesting; @@ -42,12 +41,13 @@ import com.android.settings.widget.SettingsMainSwitchBar; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import com.android.settingslib.widget.OnMainSwitchChangeListener; /** * Controller for logic pertaining to switch Wi-Fi tethering. */ public class WifiTetherSwitchBarController implements - LifecycleObserver, OnStart, OnStop, DataSaverBackend.Listener, OnCheckedChangeListener { + LifecycleObserver, OnStart, OnStop, DataSaverBackend.Listener, OnMainSwitchChangeListener { private static final String TAG = "WifiTetherSBC"; private static final IntentFilter WIFI_INTENT_FILTER; @@ -101,9 +101,9 @@ public class WifiTetherSwitchBarController implements } @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + public void onSwitchChanged(Switch switchView, boolean isChecked) { // Filter out unnecessary callbacks when switch is disabled. - if (!buttonView.isEnabled()) return; + if (!switchView.isEnabled()) return; if (isChecked) { startTether(); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningTogglePreferenceControllerTest.java index e0a04bce8ca..cdc17410493 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptioningTogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningTogglePreferenceControllerTest.java @@ -142,7 +142,7 @@ public class CaptioningTogglePreferenceControllerTest { public void onSwitchChanged_switchChecked_shouldSetCaptionEnabled() { mController.displayPreference(mScreen); - mController.onCheckedChanged(/* buttonView= */ null, /* isChecked= */ true); + mController.onSwitchChanged(/* switchView= */ null, /* isChecked= */ true); assertThat(isCaptionEnabled()).isTrue(); } @@ -151,7 +151,7 @@ public class CaptioningTogglePreferenceControllerTest { public void onSwitchChanged_switchUnchecked_shouldSetCaptionDisabled() { mController.displayPreference(mScreen); - mController.onCheckedChanged(/* buttonView= */ null, /* isChecked= */ false); + mController.onSwitchChanged(/* switchView= */ null, /* isChecked= */ false); assertThat(isCaptionEnabled()).isFalse(); } diff --git a/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java index e53ed105858..d6be73d5481 100644 --- a/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java @@ -115,11 +115,11 @@ public class WorkModePreferenceControllerTest { @Test public void onPreferenceChange_shouldRequestQuietModeEnabled() { - mController.onCheckedChanged(mSwitch, true); + mController.onSwitchChanged(mSwitch, true); verify(mUserManager).requestQuietModeEnabled(false, mManagedUser); - mController.onCheckedChanged(mSwitch, false); + mController.onSwitchChanged(mSwitch, false); verify(mUserManager).requestQuietModeEnabled(true, mManagedUser); } diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java index 9841a0f8d19..17283cfaf38 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java @@ -80,7 +80,7 @@ public class AutomaticStorageManagerSwitchBarControllerTest { @Test public void onSwitchChanged_false_recordsAMetric() { - mController.onCheckedChanged(null, false); + mController.onSwitchChanged(null, false); verify(mMetricsFeatureProvider) .action( @@ -91,7 +91,7 @@ public class AutomaticStorageManagerSwitchBarControllerTest { @Test public void onSwitchChanged_true_recordsAMetric() { - mController.onCheckedChanged(null, true); + mController.onSwitchChanged(null, true); verify(mMetricsFeatureProvider) .action( @@ -102,7 +102,7 @@ public class AutomaticStorageManagerSwitchBarControllerTest { @Test public void onSwitchChanged_showWarningFragmentIfNotEnabledByDefault() { - mController.onCheckedChanged(null, true); + mController.onSwitchChanged(null, true); verify(mFragmentManager.beginTransaction()) .add(any(Fragment.class), eq(ActivationWarningFragment.TAG)); @@ -112,7 +112,7 @@ public class AutomaticStorageManagerSwitchBarControllerTest { public void onSwitchChange_doNotShowWarningFragmentIfEnabledByDefault() { SystemProperties.set("ro.storage_manager.enabled", "true"); - mController.onCheckedChanged(null, true); + mController.onSwitchChanged(null, true); verify(mFragmentManager.beginTransaction(), never()) .add(any(Fragment.class), eq(ActivationWarningFragment.TAG)); diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java index 37a4aeab572..3189b47ab80 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java @@ -160,7 +160,7 @@ public class DevelopmentSettingsDashboardFragmentTest { Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0); - mDashboard.onCheckedChanged(null, false /* isChecked */); + mDashboard.onSwitchChanged(null, false /* isChecked */); assertThat(ShadowEnableDevelopmentSettingWarningDialog.mShown).isFalse(); } @@ -172,7 +172,7 @@ public class DevelopmentSettingsDashboardFragmentTest { Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0); - mDashboard.onCheckedChanged(null, true /* isChecked */); + mDashboard.onSwitchChanged(null, true /* isChecked */); assertThat(ShadowEnableDevelopmentSettingWarningDialog.mShown).isTrue(); } @@ -184,7 +184,7 @@ public class DevelopmentSettingsDashboardFragmentTest { Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1); - mDashboard.onCheckedChanged(null, false /* isChecked */); + mDashboard.onSwitchChanged(null, false /* isChecked */); assertThat(ShadowEnableDevelopmentSettingWarningDialog.mShown).isFalse(); assertThat(DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)).isFalse(); @@ -203,7 +203,7 @@ public class DevelopmentSettingsDashboardFragmentTest { Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1); - mDashboard.onCheckedChanged(null, false /* isChecked */); + mDashboard.onSwitchChanged(null, false /* isChecked */); AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog(); assertThat(dialog).isNotNull(); diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java index 34d22e09649..f776536d2d1 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java @@ -24,7 +24,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import android.widget.CompoundButton.OnCheckedChangeListener; import androidx.lifecycle.LifecycleOwner; @@ -32,6 +31,7 @@ import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.widget.SettingsMainSwitchBar; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.widget.OnMainSwitchChangeListener; import org.junit.After; import org.junit.Before; @@ -78,7 +78,7 @@ public class DevelopmentSwitchBarControllerTest { ShadowUtils.setIsUserAMonkey(true); new DevelopmentSwitchBarController(mSettings, mSwitchBar, true /* isAvailable */, mLifecycle); - final List listeners = + final List listeners = ReflectionHelpers.getField(mSwitchBar, "mSwitchChangeListeners"); mLifecycle.handleLifecycleEvent(ON_START); @@ -93,7 +93,7 @@ public class DevelopmentSwitchBarControllerTest { ShadowUtils.setIsUserAMonkey(false); new DevelopmentSwitchBarController(mSettings, mSwitchBar, true /* isAvailable */, mLifecycle); - final List listeners = + final List listeners = ReflectionHelpers.getField(mSwitchBar, "mSwitchChangeListeners"); mLifecycle.handleLifecycleEvent(ON_START); @@ -109,7 +109,7 @@ public class DevelopmentSwitchBarControllerTest { ShadowUtils.setIsUserAMonkey(false); new DevelopmentSwitchBarController(mSettings, mSwitchBar, true /* isAvailable */, mLifecycle); - final List listeners = + final List listeners = ReflectionHelpers.getField(mSwitchBar, "mSwitchChangeListeners"); mLifecycle.handleLifecycleEvent(ON_START); diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java index 5c38411855c..d084c512938 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java @@ -104,7 +104,7 @@ public class NightDisplayActivationPreferenceControllerTest { final NightDisplayActivationPreferenceController controller = new NightDisplayActivationPreferenceController(mContext, "night_display_activated"); - controller.onCheckedChanged(null, true); + controller.onSwitchChanged(null, true); assertThat(mColorDisplayManager.isNightDisplayActivated()).isEqualTo(true); } @@ -115,7 +115,7 @@ public class NightDisplayActivationPreferenceControllerTest { final NightDisplayActivationPreferenceController controller = new NightDisplayActivationPreferenceController(mContext, "night_display_activated"); - controller.onCheckedChanged(null, false); + controller.onSwitchChanged(null, false); assertThat(mColorDisplayManager.isNightDisplayActivated()).isEqualTo(false); } diff --git a/tests/robotests/src/com/android/settings/dream/DreamMainSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/DreamMainSwitchPreferenceControllerTest.java index 924c63ac0f8..fb55164b073 100644 --- a/tests/robotests/src/com/android/settings/dream/DreamMainSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/DreamMainSwitchPreferenceControllerTest.java @@ -28,6 +28,7 @@ import androidx.test.core.app.ApplicationProvider; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.widget.MainSwitchPreference; +import com.android.settingslib.widget.OnMainSwitchChangeListener; import org.junit.After; import org.junit.Before; @@ -52,6 +53,8 @@ public class DreamMainSwitchPreferenceControllerTest { private DreamMainSwitchPreferenceController mController; private MainSwitchPreference mPreference; private DreamBackend mBackend; + @Mock + private OnMainSwitchChangeListener mChangeListener; private ShadowContentResolver mShadowContentResolver; @Before diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java index 3b80efbdecf..e50edecec09 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java @@ -39,7 +39,7 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; -import android.widget.CompoundButton; +import android.widget.Switch; import androidx.fragment.app.FragmentActivity; import androidx.loader.app.LoaderManager; @@ -109,7 +109,7 @@ public class PowerBackgroundUsageDetailTest { @Mock private BackupManager mBackupManager; @Mock private PackageManager mPackageManager; @Mock private AppOpsManager mAppOpsManager; - @Mock private CompoundButton mMockSwitch; + @Mock private Switch mMockSwitch; @Before public void setUp() { @@ -259,7 +259,7 @@ public class PowerBackgroundUsageDetailTest { final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED; mFragment.mOptimizationMode = optimizedMode; - mFragment.onCheckedChanged(mMockSwitch, /* isChecked= */ false); + mFragment.onSwitchChanged(mMockSwitch, /* isChecked= */ false); verify(mOptimizePreference).setEnabled(false); verify(mUnrestrictedPreference).setEnabled(false); @@ -275,7 +275,7 @@ public class PowerBackgroundUsageDetailTest { final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED; mFragment.mOptimizationMode = restrictedMode; - mFragment.onCheckedChanged(mMockSwitch, /* isChecked= */ true); + mFragment.onSwitchChanged(mMockSwitch, /* isChecked= */ true); verify(mOptimizePreference).setEnabled(true); verify(mUnrestrictedPreference).setEnabled(true); diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingSwitchPreferenceControllerTest.java index 67618c8ab3b..5f25759ba93 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingSwitchPreferenceControllerTest.java @@ -116,7 +116,7 @@ public class PreventRingingSwitchPreferenceControllerTest { Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE, VOLUME_HUSH_OFF); - mController.onCheckedChanged(null, true); + mController.onSwitchChanged(null, true); assertThat(Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE, UNKNOWN)).isEqualTo(VOLUME_HUSH_VIBRATE); @@ -127,7 +127,7 @@ public class PreventRingingSwitchPreferenceControllerTest { Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE, VOLUME_HUSH_MUTE); - mController.onCheckedChanged(null, false); + mController.onSwitchChanged(null, false); assertThat(Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE, UNKNOWN)).isEqualTo(VOLUME_HUSH_OFF); @@ -139,7 +139,7 @@ public class PreventRingingSwitchPreferenceControllerTest { Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE, VOLUME_HUSH_MUTE); - mController.onCheckedChanged(null, true); + mController.onSwitchChanged(null, true); assertThat(Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE, UNKNOWN)).isEqualTo(VOLUME_HUSH_MUTE); @@ -151,7 +151,7 @@ public class PreventRingingSwitchPreferenceControllerTest { Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE, VOLUME_HUSH_VIBRATE); - mController.onCheckedChanged(null, true); + mController.onSwitchChanged(null, true); assertThat(Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE, UNKNOWN)).isEqualTo(VOLUME_HUSH_VIBRATE); diff --git a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java index 1f20d59dcfd..50f618f5ffe 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java @@ -85,14 +85,14 @@ public class LocationSwitchBarControllerTest { @Test public void onSwitchChanged_switchChecked_shouldSetLocationEnabled() { - mController.onCheckedChanged(mSwitch, true); + mController.onSwitchChanged(mSwitch, true); verify(mEnabler).setLocationEnabled(true); } @Test public void onSwitchChanged_switchUnchecked_shouldSetLocationDisabled() { - mController.onCheckedChanged(mSwitch, false); + mController.onSwitchChanged(mSwitch, false); verify(mEnabler).setLocationEnabled(false); } diff --git a/tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java index b2759767112..b346b01277d 100644 --- a/tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java @@ -112,7 +112,7 @@ public class BubbleNotificationPreferenceControllerTest { public void onSwitchChanged_true_settingIsOff_flagShouldOn() { Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, OFF); - mController.onCheckedChanged(mSwitch, true); + mController.onSwitchChanged(mSwitch, true); assertThat(Settings.Global.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, OFF)).isEqualTo(ON); @@ -122,7 +122,7 @@ public class BubbleNotificationPreferenceControllerTest { public void onSwitchChanged_false_settingIsOn_flagShouldOff() { Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, ON); - mController.onCheckedChanged(mSwitch, false); + mController.onSwitchChanged(mSwitch, false); assertThat(Settings.Global.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, ON)).isEqualTo(OFF); diff --git a/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java index abcf2de7504..9e9e655e3af 100644 --- a/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java @@ -101,7 +101,7 @@ public class BlockPreferenceControllerTest { @Test public void testNoCrashIfNoOnResume() { mController.isAvailable(); - mController.onCheckedChanged(null, false); + mController.onSwitchChanged(null, false); } @Test @@ -355,11 +355,11 @@ public class BlockPreferenceControllerTest { mController.onResume(appRow, channel, null, null, null, null, null); mController.updateState(mPreference); - mController.onCheckedChanged(null, false); + mController.onSwitchChanged(null, false); assertEquals(IMPORTANCE_NONE, channel.getImportance()); assertTrue(appRow.banned); - mController.onCheckedChanged(null, true); + mController.onSwitchChanged(null, true); assertEquals(IMPORTANCE_UNSPECIFIED, channel.getImportance()); assertFalse(appRow.banned); @@ -377,10 +377,10 @@ public class BlockPreferenceControllerTest { mController.onResume(appRow, channel, null, null, null, null, null); mController.updateState(mPreference); - mController.onCheckedChanged(null, false); + mController.onSwitchChanged(null, false); assertEquals(IMPORTANCE_NONE, channel.getImportance()); - mController.onCheckedChanged(null, true); + mController.onSwitchChanged(null, true); assertEquals(IMPORTANCE_HIGH, channel.getImportance()); verify(mBackend, times(2)).updateChannel(any(), anyInt(), any()); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java index 2e6189ea16d..1faa611b970 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java @@ -292,7 +292,7 @@ public class WifiCallingSettingsForSubTest { public void onSwitchChanged_enableSetting_shouldLaunchWfcDisclaimerFragment() { final ArgumentCaptor intentCaptor = ArgumentCaptor.forClass(Intent.class); - mFragment.onCheckedChanged(null, true); + mFragment.onSwitchChanged(null, true); // Check the WFC disclaimer fragment is launched. verify(mFragment).startActivityForResult(intentCaptor.capture(), @@ -337,7 +337,7 @@ public class WifiCallingSettingsForSubTest { @Test public void onSwitchChanged_disableSetting_shouldNotLaunchWfcDisclaimerFragment() { - mFragment.onCheckedChanged(null, false); + mFragment.onSwitchChanged(null, false); // Check the WFC disclaimer fragment is not launched. verify(mFragment, never()).startActivityForResult(any(Intent.class), anyInt()); diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java index 0982f26d76c..ca0247fdd05 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java @@ -150,7 +150,7 @@ public class WifiTetherSwitchBarControllerTest { public void onSwitchChanged_switchNotEnabled_doNothingForTethering() { when(mSwitch.isEnabled()).thenReturn(false); - mController.onCheckedChanged(mSwitch, true); + mController.onSwitchChanged(mSwitch, mSwitch.isChecked()); verify(mConnectivityManager, never()).startTethering(anyInt(), anyBoolean(), any(), any()); verify(mConnectivityManager, never()).stopTethering(anyInt()); @@ -158,7 +158,9 @@ public class WifiTetherSwitchBarControllerTest { @Test public void onSwitchChanged_isChecked_startTethering() { - mController.onCheckedChanged(mSwitch, true); + when(mSwitch.isChecked()).thenReturn(true); + + mController.onSwitchChanged(mSwitch, mSwitch.isChecked()); verify(mConnectivityManager).startTethering(anyInt(), anyBoolean(), any(), any()); } @@ -166,7 +168,9 @@ public class WifiTetherSwitchBarControllerTest { @Test public void onSwitchChanged_isNotChecked_stopTethering() { when(mWifiManager.getWifiApState()).thenReturn(WIFI_AP_STATE_ENABLED); - mController.onCheckedChanged(mSwitch, false); + when(mSwitch.isChecked()).thenReturn(false); + + mController.onSwitchChanged(mSwitch, mSwitch.isChecked()); verify(mConnectivityManager).stopTethering(anyInt()); }