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

Commit cc0a02bf authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Automerger Merge Worker
Browse files

Merge "battery LED: nearly full level is now configurable" am: 4f2e53f9 am:... 

Merge "battery LED: nearly full level is now configurable" am: 4f2e53f9 am: 5623990f am: 72f30d3c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2238876



Change-Id: I634838a46a6c47e057d9a6288f42e3ae5f3ced7c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents debd10f0 72f30d3c

core/res/res/values/config.xml

+4 −1
Original line number Diff line number Diff line
@@ -1316,7 +1316,7 @@ 
    <!-- Default value for led color when battery is medium charged -->

    <integer name="config_notificationsBatteryMediumARGB">0xFFFFFF00</integer>



    <!-- Default value for led color when battery is fully charged -->

    <!-- Default value for led color when battery is fully or nearly fully charged -->

    <integer name="config_notificationsBatteryFullARGB">0xFF00FF00</integer>



    <!-- Default value for LED on time when the battery is low on charge in miliseconds -->
@@ -1331,6 +1331,9 @@ 
    <!-- Default value for LED off time when the battery is low on charge in miliseconds -->

    <integer name="config_notificationsBatteryLedOff">2875</integer>



    <!-- Battery level percent that is treated as nearly full. -->

    <integer name="config_notificationsBatteryNearlyFullLevel">90</integer>



    <!-- If true, only colorized CallStyle notifications will apply custom colors -->

    <bool name="config_callNotificationActionColorsRequireColorized">true</bool>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2001,6 +2001,7 @@ 
  <java-symbol type="integer" name="config_notificationsBatteryLedOn" />

  <java-symbol type="integer" name="config_notificationsBatteryLowARGB" />

  <java-symbol type="integer" name="config_notificationsBatteryMediumARGB" />

  <java-symbol type="integer" name="config_notificationsBatteryNearlyFullLevel" />

  <java-symbol type="integer" name="config_notificationServiceArchiveSize" />

  <java-symbol type="integer" name="config_previousVibrationsDumpLimit" />

  <java-symbol type="integer" name="config_defaultVibrationAmplitude" />

services/core/java/com/android/server/BatteryService.java

+5 −1
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ public final class BatteryService extends SystemService { 
    private int mLowBatteryWarningLevel;

    private int mLastLowBatteryWarningLevel;

    private int mLowBatteryCloseWarningLevel;

    private int mBatteryNearlyFullLevel;

    private int mShutdownBatteryTemperature;



    private int mPlugType;
@@ -1212,6 +1213,8 @@ public final class BatteryService extends SystemService { 
                    com.android.internal.R.integer.config_notificationsBatteryLedOn);

            mBatteryLedOff = context.getResources().getInteger(

                    com.android.internal.R.integer.config_notificationsBatteryLedOff);

            mBatteryNearlyFullLevel = context.getResources().getInteger(

                    com.android.internal.R.integer.config_notificationsBatteryNearlyFullLevel);

        }



        /**
@@ -1234,7 +1237,8 @@ public final class BatteryService extends SystemService { 
                }

            } else if (status == BatteryManager.BATTERY_STATUS_CHARGING

                    || status == BatteryManager.BATTERY_STATUS_FULL) {

                if (status == BatteryManager.BATTERY_STATUS_FULL || level >= 90) {

                if (status == BatteryManager.BATTERY_STATUS_FULL

                        || level >= mBatteryNearlyFullLevel) {

                    // Solid green when full or charging and nearly full

                    mBatteryLight.setColor(mBatteryFullARGB);

                } else {