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

Commit 8979681a authored by Sebastian Pickl's avatar Sebastian Pickl Committed by Android (Google) Code Review
Browse files

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
parent 71d1f021

src/com/android/settings/accessibility/CaptioningTogglePreferenceController.java

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

        }

src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java

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

        }

src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java

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

    }

src/com/android/settings/accounts/WorkModePreferenceController.java

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

    }

src/com/android/settings/applications/intentpicker/AppLaunchSettings.java

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