Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf70eddd authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Fix ContentProtectionTogglePreferenceController 

The OnMainSwitchChangeListener is replaced with OnCheckedChangeListener

Bug: 306658427
Test: m Settings
Change-Id: I24021cb9acb308c3f85e51e9f79ad2bf564c789a
parent 8979681a

src/com/android/settings/security/ContentProtectionTogglePreferenceController.java

+4 −4
Original line number Diff line number Diff line
@@ -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);

        }

tests/robotests/src/com/android/settings/security/ContentProtectionTogglePreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

    }