Merge "Fix battery icon flashing quickly on percent change" into gingerbread (776d5a96) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -584,6 +584,7 @@ public class StatusBarPolicy {
		};

		private boolean mShowCmBattery;
		private boolean mCmBatteryStatus;

		class SettingsObserver extends ContentObserver {
		SettingsObserver(Handler handler) {
		@@ -773,8 +774,11 @@ public class StatusBarPolicy {
		private final void updateBattery(Intent intent) {
		final int id = intent.getIntExtra("icon-small", 0);
		int level = intent.getIntExtra("level", 0);
		if(!mShowCmBattery \|\| mCmBatteryStatus != mShowCmBattery) {
		mService.setIcon("battery", id, level);
		mService.setIconVisibility("battery", !mShowCmBattery);
		mCmBatteryStatus = mShowCmBattery;
		}

		boolean plugged = intent.getIntExtra("plugged", 0) != 0;
		level = intent.getIntExtra("level", -1);
		@@ -1555,6 +1559,7 @@ public class StatusBarPolicy {

		mShowCmBattery = (Settings.System.getInt(resolver,
		Settings.System.STATUS_BAR_CM_BATTERY, 0) == 1);
		mCmBatteryStatus = !mShowCmBattery;
		mService.setIconVisibility("battery", !mShowCmBattery);
		}
		}