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

Use SettingsLib's MainSwitchPreference to replace the Switches which use

Browse Source 
LayoutPreference.

Bug: 175181773
Test: Run robotest and apply the widget in Settings and see the ui
Change-Id: I4588d1fc3004970b174e7c5c5d1aa7745f774985
This commit is contained in:
Stanley Wang
2021-01-05 16:09:37 +08:00
parent adcd4f165d
commit 57098f4589
11 changed files with 57 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/gestures/EmergencyGesturePreferenceController.java
View File

@@ -21,18 +21,19 @@ import android.provider.Settings;
import android.widget.Switch;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.widget.LayoutPreference;
import com.android.settingslib.widget.MainSwitchPreference;
import com.android.settingslib.widget.OnMainSwitchChangeListener;
/**
* Preference controller for emergency gesture setting
*/
public class EmergencyGesturePreferenceController extends BasePreferenceController implements
SwitchBar.OnSwitchChangeListener {
OnMainSwitchChangeListener {
@VisibleForTesting
static final int ON = 1;
@@ -41,7 +42,7 @@ public class EmergencyGesturePreferenceController extends BasePreferenceControll
private static final String SECURE_KEY = Settings.Secure.EMERGENCY_GESTURE_ENABLED;
private SwitchBar mSwitchBar;
private MainSwitchPreference mSwitchBar;
public EmergencyGesturePreferenceController(Context context, String key) {
super(context, key);
@@ -61,13 +62,11 @@ public class EmergencyGesturePreferenceController extends BasePreferenceControll
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
final LayoutPreference pref = screen.findPreference(mPreferenceKey);
mSwitchBar = pref.findViewById(R.id.switch_bar);
mSwitchBar.setSwitchBarText(R.string.emergency_gesture_switchbar_title,
R.string.emergency_gesture_switchbar_title);
final Preference pref = screen.findPreference(mPreferenceKey);
mSwitchBar = (MainSwitchPreference) pref;
mSwitchBar.setTitle(mContext.getString(R.string.emergency_gesture_switchbar_title));
mSwitchBar.addOnSwitchChangeListener(this);
mSwitchBar.setChecked(isChecked());
mSwitchBar.show();
mSwitchBar.updateStatus(isChecked());
}
@VisibleForTesting

21
src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java
View File

@@ -26,18 +26,18 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.widget.LayoutPreference;
import com.android.settingslib.widget.MainSwitchPreference;
import com.android.settingslib.widget.OnMainSwitchChangeListener;
public class PreventRingingSwitchPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, SwitchBar.OnSwitchChangeListener {
implements PreferenceControllerMixin, OnMainSwitchChangeListener {
private static final String KEY = "gesture_prevent_ringing_switch";
private final Context mContext;
@VisibleForTesting
SwitchBar mSwitch;
MainSwitchPreference mSwitch;
public PreventRingingSwitchPreferenceController(Context context) {
super(context);
@@ -53,7 +53,7 @@ public class PreventRingingSwitchPreferenceController extends AbstractPreference
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
if (isAvailable()) {
LayoutPreference pref = screen.findPreference(getPreferenceKey());
Preference pref = screen.findPreference(getPreferenceKey());
if (pref != null) {
pref.setOnPreferenceClickListener(preference -> {
int preventRinging = Settings.Secure.getInt(mContext.getContentResolver(),
@@ -66,18 +66,17 @@ public class PreventRingingSwitchPreferenceController extends AbstractPreference
: Settings.Secure.VOLUME_HUSH_VIBRATE);
return true;
});
mSwitch = pref.findViewById(R.id.switch_bar);
if (mSwitch != null) {
mSwitch.addOnSwitchChangeListener(this);
mSwitch.show();
}
mSwitch = (MainSwitchPreference) pref;
mSwitch.setTitle(mContext.getString(R.string.prevent_ringing_main_switch_title));
mSwitch.addOnSwitchChangeListener(this);
updateState(mSwitch);
}
}
}
public void setChecked(boolean isChecked) {
if (mSwitch != null) {
mSwitch.setChecked(isChecked);
mSwitch.updateStatus(isChecked);
}
}

18
src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java
View File

@@ -25,18 +25,18 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.LayoutPreference;
import com.android.settingslib.widget.MainSwitchPreference;
import com.android.settingslib.widget.OnMainSwitchChangeListener;
public class ZenAutomaticRuleSwitchPreferenceController extends
AbstractZenModeAutomaticRulePreferenceController implements
SwitchBar.OnSwitchChangeListener {
OnMainSwitchChangeListener {
private static final String KEY = "zen_automatic_rule_switch";
private AutomaticZenRule mRule;
private String mId;
private SwitchBar mSwitchBar;
private MainSwitchPreference mSwitchBar;
public ZenAutomaticRuleSwitchPreferenceController(Context context, Fragment parent,
Lifecycle lifecycle) {
@@ -56,12 +56,11 @@ public class ZenAutomaticRuleSwitchPreferenceController extends
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
LayoutPreference pref = screen.findPreference(KEY);
mSwitchBar = pref.findViewById(R.id.switch_bar);
final Preference pref = screen.findPreference(KEY);
mSwitchBar = (MainSwitchPreference) pref;
if (mSwitchBar != null) {
mSwitchBar.setSwitchBarText(R.string.zen_mode_use_automatic_rule,
R.string.zen_mode_use_automatic_rule);
mSwitchBar.setTitle(mContext.getString(R.string.zen_mode_use_automatic_rule));
try {
pref.setOnPreferenceClickListener(preference -> {
mRule.setEnabled(!mRule.isEnabled());
@@ -72,7 +71,6 @@ public class ZenAutomaticRuleSwitchPreferenceController extends
} catch (IllegalStateException e) {
// an exception is thrown if you try to add the listener twice
}
mSwitchBar.show();
}
}
@@ -83,7 +81,7 @@ public class ZenAutomaticRuleSwitchPreferenceController extends
public void updateState(Preference preference) {
if (mRule != null) {
mSwitchBar.setChecked(mRule.isEnabled());
mSwitchBar.updateStatus(mRule.isEnabled());
}
}