Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix "auto battery saver" confirmation dialog button layout" into pi-dev

Browse Source
This commit is contained in:
Makoto Onuki
2018-04-03 22:25:37 +00:00
committed by Android (Google) Code Review
parent 7065aedba0 41d5ccf6ed
commit 1c3e76b10e
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java
View File

@@ -484,16 +484,24 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
d.setMessage(mContext.getString(R.string.auto_saver_enabled_text, d.setMessage(mContext.getString(R.string.auto_saver_enabled_text,
getLowBatteryAutoTriggerDefaultLevel())); getLowBatteryAutoTriggerDefaultLevel()));
// Negative == "got it". Just close the dialog. Battery saver has already been enabled. // "Got it". Just close the dialog. Automatic battery has been enabled already.
d.setNegativeButton(R.string.auto_saver_okay_action, null); d.setPositiveButton(R.string.auto_saver_okay_action,
d.setPositiveButton(R.string.open_saver_setting_action, (dialog, which) -> (dialog, which) -> onAutoSaverEnabledConfirmationClosed());
mContext.startActivity(actionBatterySaverSetting));
// "Settings" -> Opens the battery saver settings activity.
d.setNeutralButton(R.string.open_saver_setting_action, (dialog, which) -> {
mContext.startActivity(actionBatterySaverSetting);
onAutoSaverEnabledConfirmationClosed();
});
d.setShowForAllUsers(true); d.setShowForAllUsers(true);
d.setOnDismissListener((dialog) -> mSaverEnabledConfirmation = null); d.setOnDismissListener((dialog) -> onAutoSaverEnabledConfirmationClosed());
d.show(); d.show();
mSaverEnabledConfirmation = d; mSaverEnabledConfirmation = d;
} }
private void onAutoSaverEnabledConfirmationClosed() {
mSaverEnabledConfirmation = null;
}
private void setSaverMode(boolean mode, boolean needFirstTimeWarning) { private void setSaverMode(boolean mode, boolean needFirstTimeWarning) {
BatterySaverUtils.setPowerSaveMode(mContext, mode, needFirstTimeWarning); BatterySaverUtils.setPowerSaveMode(mContext, mode, needFirstTimeWarning);

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java
View File

@@ -69,6 +69,10 @@ public class SystemUIDialog extends AlertDialog {
setButton(BUTTON_NEGATIVE, mContext.getString(resId), onClick); setButton(BUTTON_NEGATIVE, mContext.getString(resId), onClick);
} }
public void setNeutralButton(int resId, OnClickListener onClick) {
setButton(BUTTON_NEUTRAL, mContext.getString(resId), onClick);
}
public static void setShowForAllUsers(Dialog dialog, boolean show) { public static void setShowForAllUsers(Dialog dialog, boolean show) {
if (show) { if (show) {
dialog.getWindow().getAttributes().privateFlags |= dialog.getWindow().getAttributes().privateFlags |=