PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ContentProtectionTogglePreferenceController" into main

Browse Source
This commit is contained in:
Chaohui Wang
2023-11-08 09:05:22 +00:00
committed by Android (Google) Code Review
parent 32d9280e97 bf70edddd0
commit 0e1edc6c74
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/security/ContentProtectionTogglePreferenceController.java
View File

@@ -19,7 +19,8 @@ package com.android.settings.security;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
import android.widget.Switch; import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -28,11 +29,10 @@ import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
import com.android.settings.widget.SettingsMainSwitchPreference; import com.android.settings.widget.SettingsMainSwitchPreference;
import com.android.settingslib.widget.OnMainSwitchChangeListener;
/** Preference controller for content protection toggle switch bar. */ /** Preference controller for content protection toggle switch bar. */
public class ContentProtectionTogglePreferenceController extends TogglePreferenceController public class ContentProtectionTogglePreferenceController extends TogglePreferenceController
implements OnMainSwitchChangeListener { implements OnCheckedChangeListener {
@VisibleForTesting @VisibleForTesting
static final String KEY_CONTENT_PROTECTION_PREFERENCE = "content_protection_user_consent"; static final String KEY_CONTENT_PROTECTION_PREFERENCE = "content_protection_user_consent";
@@ -81,7 +81,7 @@ public class ContentProtectionTogglePreferenceController extends TogglePreferenc
} }
@Override @Override
public void onSwitchChanged(Switch switchView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked != isChecked()) { if (isChecked != isChecked()) {
setChecked(isChecked); setChecked(isChecked);
} }

4
tests/robotests/src/com/android/settings/security/ContentProtectionTogglePreferenceControllerTest.java
View File

@@ -125,7 +125,7 @@ public class ContentProtectionTogglePreferenceControllerTest {
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
mController.setChecked(false); mController.setChecked(false);
mController.onSwitchChanged(/* switchView= */ null, /* isChecked= */ true); mController.onCheckedChanged(/* switchView= */ null, /* isChecked= */ true);
assertThat(getContentProtectionGlobalSetting()).isEqualTo(1); assertThat(getContentProtectionGlobalSetting()).isEqualTo(1);
} }
@@ -134,7 +134,7 @@ public class ContentProtectionTogglePreferenceControllerTest {
public void onSwitchChanged_switchUnchecked_manuallyDisabled() { public void onSwitchChanged_switchUnchecked_manuallyDisabled() {
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
mController.onSwitchChanged(/* switchView= */ null, /* isChecked= */ false); mController.onCheckedChanged(/* switchView= */ null, /* isChecked= */ false);
assertThat(getContentProtectionGlobalSetting()).isEqualTo(-1); assertThat(getContentProtectionGlobalSetting()).isEqualTo(-1);
} }