am 54d83daa: am 19e8273b: Merge "Don\'t show [!] battery at boot." into klp-dev (3393e58d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

+11 −2

Original line number	Original line	Diff line number	Diff line
	@@ -69,8 +69,10 @@ public class BatteryMeterView extends View implements DemoMode {
	private final Rect mBoltFrame = new Rect();		private final Rect mBoltFrame = new Rect();

	private class BatteryTracker extends BroadcastReceiver {		private class BatteryTracker extends BroadcastReceiver {
			public static final int UNKNOWN_LEVEL = -1;

	// current battery status		// current battery status
	int level;		int level = UNKNOWN_LEVEL;
	String percentStr;		String percentStr;
	int plugType;		int plugType;
	boolean plugged;		boolean plugged;
	@@ -148,7 +150,11 @@ public class BatteryMeterView extends View implements DemoMode {
	IntentFilter filter = new IntentFilter();		IntentFilter filter = new IntentFilter();
	filter.addAction(Intent.ACTION_BATTERY_CHANGED);		filter.addAction(Intent.ACTION_BATTERY_CHANGED);
	filter.addAction(ACTION_LEVEL_TEST);		filter.addAction(ACTION_LEVEL_TEST);
	getContext().registerReceiver(mTracker, filter);		final Intent sticky = getContext().registerReceiver(mTracker, filter);
			if (sticky != null) {
			// preload the battery level
			mTracker.onReceive(getContext(), sticky);
			}
	}		}

	@Override		@Override
	@@ -256,6 +262,9 @@ public class BatteryMeterView extends View implements DemoMode {
	public void draw(Canvas c) {		public void draw(Canvas c) {
	BatteryTracker tracker = mDemoMode ? mDemoTracker : mTracker;		BatteryTracker tracker = mDemoMode ? mDemoTracker : mTracker;
	final int level = tracker.level;		final int level = tracker.level;

			if (level == BatteryTracker.UNKNOWN_LEVEL) return;

	float drawFrac = (float) level / 100f;		float drawFrac = (float) level / 100f;
	final int pt = getPaddingTop();		final int pt = getPaddingTop();
	final int pl = getPaddingLeft();		final int pl = getPaddingLeft();