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

Commit 92cdc549 authored by Raff Tsai's avatar Raff Tsai
Browse files

Fix battery saver slider is not displaying 

- Doesn't save Settings values to secondary user, caused
BatterySaverUtils.maybeShowBatterySaverConfirmation return true.
BatterySaverScheduleRadioButtonsController reset some Settings to
default when maybeShowBatterySaverConfirmation is true which lead
to the slider hiding.

Fixes: 133782238
Test: change to secondary user. Open Settings -> Battery ->
      Battery Saver -> Set a schedule. User will not see confirm
      dialog after switch different schedule.

Change-Id: I4b8706fd0c542a199fd1e08a44e7a542fbb2d7e7
parent bc189e7d

packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Context; 
import android.content.Intent;

import android.os.Bundle;

import android.os.PowerManager;

import android.os.UserHandle;

import android.provider.Settings.Global;

import android.provider.Settings.Secure;

import android.text.TextUtils;
@@ -186,7 +187,8 @@ public class BatterySaverUtils { 
    }



    private static void setBatterySaverConfirmationAcknowledged(Context context) {

        Secure.putInt(context.getContentResolver(), Secure.LOW_POWER_WARNING_ACKNOWLEDGED, 1);

        Secure.putIntForUser(context.getContentResolver(), Secure.LOW_POWER_WARNING_ACKNOWLEDGED, 1,

                UserHandle.USER_CURRENT);

    }



    /**

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

+2 −2
Original line number Diff line number Diff line
@@ -585,10 +585,10 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
                                resolver,

                                Global.LOW_POWER_MODE_TRIGGER_LEVEL,

                                batterySaverTriggerLevel);

                        Secure.putInt(

                        Secure.putIntForUser(

                                resolver,

                                Secure.LOW_POWER_WARNING_ACKNOWLEDGED,

                                1);

                                1, UserHandle.USER_CURRENT);

                    });

        } else {

            d.setTitle(R.string.battery_saver_confirmation_title);