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

Commit d2ee53f6 authored by Wesley Wang's avatar Wesley Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove EnhancedEstimates isHybird flag from trigger condition" into... 

Merge "Remove EnhancedEstimates isHybird flag from trigger condition" into tm-dev am: 4788cc8e am: 308a7d84

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



Change-Id: I2dd0691b03eeb2c0796d72107b3a2bcb7874ea2c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bad397b9 308a7d84

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

+2 −5
Original line number Diff line number Diff line
@@ -292,10 +292,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
            return;

        }



        final int warningLevel = mContext.getResources().getInteger(

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

        final String percentage = NumberFormat.getPercentInstance()

                .format((double) warningLevel / 100.0);

                .format((double) mCurrentBatterySnapshot.getBatteryLevel() / 100.0);

        final String title = mContext.getString(R.string.battery_low_title);

        final String contentText = mContext.getString(

                R.string.battery_low_description, percentage);
@@ -340,8 +338,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
    }



    private boolean showSevereLowBatteryDialog() {

        final boolean isSevereState = !mCurrentBatterySnapshot.isHybrid() || mBucket < -1;

        return isSevereState && mUseSevereDialog;

        return mBucket < -1 && mUseSevereDialog;

    }



    /**

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

+1 −5
Original line number Diff line number Diff line
@@ -359,11 +359,7 @@ public class PowerUI extends CoreStartable implements CommandQueue.Callbacks { 
        }



        mWarnings.updateSnapshot(mCurrentBatteryStateSnapshot);

        if (mCurrentBatteryStateSnapshot.isHybrid()) {

        maybeShowHybridWarning(mCurrentBatteryStateSnapshot, mLastBatteryStateSnapshot);

        } else {

            maybeShowBatteryWarning(mCurrentBatteryStateSnapshot, mLastBatteryStateSnapshot);

        }

    }



    // updates the time estimate if we don't have one or battery level has changed.