diff --git a/src/com/android/settings/security/ContentProtectionTogglePreferenceController.java b/src/com/android/settings/security/ContentProtectionTogglePreferenceController.java index 686b25bf784..b656093f818 100644 --- a/src/com/android/settings/security/ContentProtectionTogglePreferenceController.java +++ b/src/com/android/settings/security/ContentProtectionTogglePreferenceController.java @@ -19,7 +19,8 @@ package com.android.settings.security; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.widget.Switch; +import android.widget.CompoundButton; +import android.widget.CompoundButton.OnCheckedChangeListener; import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; @@ -28,11 +29,10 @@ import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.TogglePreferenceController; import com.android.settings.widget.SettingsMainSwitchPreference; -import com.android.settingslib.widget.OnMainSwitchChangeListener; /** Preference controller for content protection toggle switch bar. */ public class ContentProtectionTogglePreferenceController extends TogglePreferenceController - implements OnMainSwitchChangeListener { + implements OnCheckedChangeListener { @VisibleForTesting static final String KEY_CONTENT_PROTECTION_PREFERENCE = "content_protection_user_consent"; @@ -81,7 +81,7 @@ public class ContentProtectionTogglePreferenceController extends TogglePreferenc } @Override - public void onSwitchChanged(Switch switchView, boolean isChecked) { + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked != isChecked()) { setChecked(isChecked); } diff --git a/tests/robotests/src/com/android/settings/security/ContentProtectionTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ContentProtectionTogglePreferenceControllerTest.java index b10ff22b353..63b6c3eeb66 100644 --- a/tests/robotests/src/com/android/settings/security/ContentProtectionTogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ContentProtectionTogglePreferenceControllerTest.java @@ -125,7 +125,7 @@ public class ContentProtectionTogglePreferenceControllerTest { mController.displayPreference(mScreen); mController.setChecked(false); - mController.onSwitchChanged(/* switchView= */ null, /* isChecked= */ true); + mController.onCheckedChanged(/* switchView= */ null, /* isChecked= */ true); assertThat(getContentProtectionGlobalSetting()).isEqualTo(1); } @@ -134,7 +134,7 @@ public class ContentProtectionTogglePreferenceControllerTest { public void onSwitchChanged_switchUnchecked_manuallyDisabled() { mController.displayPreference(mScreen); - mController.onSwitchChanged(/* switchView= */ null, /* isChecked= */ false); + mController.onCheckedChanged(/* switchView= */ null, /* isChecked= */ false); assertThat(getContentProtectionGlobalSetting()).isEqualTo(-1); }