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

Commit 017f0af9 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge "Fix "auto battery saver" confirmation dialog button layout" into pi-dev am: 1c3e76b1 

am: bd086f6c

Change-Id: I13ec737a58d19451dc8d3219acc6d4c17e8b9579
parents 703b235b bd086f6c

packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java

+13 −5
Original line number Diff line number Diff line
@@ -484,16 +484,24 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
        d.setMessage(mContext.getString(R.string.auto_saver_enabled_text,

                getLowBatteryAutoTriggerDefaultLevel()));



        // Negative == "got it". Just close the dialog. Battery saver has already been enabled.

        d.setNegativeButton(R.string.auto_saver_okay_action, null);

        d.setPositiveButton(R.string.open_saver_setting_action, (dialog, which) ->

                mContext.startActivity(actionBatterySaverSetting));

        // "Got it". Just close the dialog. Automatic battery has been enabled already.

        d.setPositiveButton(R.string.auto_saver_okay_action,

                (dialog, which) -> onAutoSaverEnabledConfirmationClosed());



        // "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.setOnDismissListener((dialog) -> mSaverEnabledConfirmation = null);

        d.setOnDismissListener((dialog) -> onAutoSaverEnabledConfirmationClosed());

        d.show();

        mSaverEnabledConfirmation = d;

    }



    private void onAutoSaverEnabledConfirmationClosed() {

        mSaverEnabledConfirmation = null;

    }



    private void setSaverMode(boolean mode, boolean needFirstTimeWarning) {

        BatterySaverUtils.setPowerSaveMode(mContext, mode, needFirstTimeWarning);

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

+4 −0
Original line number Diff line number Diff line
@@ -69,6 +69,10 @@ public class SystemUIDialog extends AlertDialog { 
        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) {

        if (show) {

            dialog.getWindow().getAttributes().privateFlags |=