Merge "Remove EnhancedEstimates isHybird flag from trigger condition" into tm-dev (4788cc8e) · Commits · e / os / android_frameworks_base

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

+2 −5

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}

	/**		/**

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -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.