Merge "[Settings] Support master switch of inline toggle of Settings Injection v2"

This commit is contained in:
Jason Chiu
2019-11-25 02:36:09 +00:00
committed by Android (Google) Code Review
5 changed files with 34 additions and 8 deletions

View File

@@ -36,6 +36,7 @@ public class MasterSwitchPreference extends TwoTargetPreference {
private Switch mSwitch;
private boolean mChecked;
private boolean mCheckedSet;
private boolean mEnableSwitch = true;
public MasterSwitchPreference(Context context, AttributeSet attrs,
@@ -94,9 +95,14 @@ public class MasterSwitchPreference extends TwoTargetPreference {
}
public void setChecked(boolean checked) {
mChecked = checked;
if (mSwitch != null) {
mSwitch.setChecked(checked);
// Always set checked the first time; don't assume the field's default of false.
final boolean changed = mChecked != checked;
if (changed || !mCheckedSet) {
mChecked = checked;
mCheckedSet = true;
if (mSwitch != null) {
mSwitch.setChecked(checked);
}
}
}