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

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

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

Change-Id: I84303198dc0d3bddb8b86458d59ef465ae6337ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wesley Wang
2022-05-20 12:26:44 +00:00
committed by Automerger Merge Worker
parent 623ab35698 4788cc8ee1
commit 308a7d8451
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -292,10 +292,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
return; return;
} }
final int warningLevel = mContext.getResources().getInteger(
com.android.internal.R.integer.config_lowBatteryWarningLevel);
final String percentage = NumberFormat.getPercentInstance() 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 title = mContext.getString(R.string.battery_low_title);
final String contentText = mContext.getString( final String contentText = mContext.getString(
R.string.battery_low_description, percentage); R.string.battery_low_description, percentage);
@@ -340,8 +338,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
} }
private boolean showSevereLowBatteryDialog() { private boolean showSevereLowBatteryDialog() {
final boolean isSevereState = !mCurrentBatterySnapshot.isHybrid() || mBucket < -1; return mBucket < -1 && mUseSevereDialog;
return isSevereState && mUseSevereDialog;
} }
/** /**

4
packages/SystemUI/src/com/android/systemui/power/PowerUI.java
View File

@@ -359,11 +359,7 @@ public class PowerUI extends CoreStartable implements CommandQueue.Callbacks {
} }
mWarnings.updateSnapshot(mCurrentBatteryStateSnapshot); mWarnings.updateSnapshot(mCurrentBatteryStateSnapshot);
if (mCurrentBatteryStateSnapshot.isHybrid()) {
maybeShowHybridWarning(mCurrentBatteryStateSnapshot, mLastBatteryStateSnapshot); maybeShowHybridWarning(mCurrentBatteryStateSnapshot, mLastBatteryStateSnapshot);
} else {
maybeShowBatteryWarning(mCurrentBatteryStateSnapshot, mLastBatteryStateSnapshot);
}
} }
// updates the time estimate if we don't have one or battery level has changed. // updates the time estimate if we don't have one or battery level has changed.