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

Revert "Migrate to CompoundButton.OnCheckedChangeListener"

Browse Source 
Revert submission 25147565-onSwitchChanged-CompoundButton

Reason for revert: breaking builds 

Bug:309601476

Reverted changes: /q/submissionid:25147565-onSwitchChanged-CompoundButton

Change-Id: Ie746db87d9c642599593aa3d5e5baf6b7ba89c0e
This commit is contained in:
Sebastian Pickl
2023-11-07 13:26:36 +00:00
committed by Android (Google) Code Review
parent 71d1f021af
commit 8979681a8d
49 changed files with 188 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/backup/AutoRestorePreferenceController.java
View File

@@ -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);
}

4
src/com/android/settings/backup/ToggleBackupSettingFragment.java
View File

@@ -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.