summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/statusbar/phone
diff options
context:
space:
mode:
authorDalingrin <dalingrin@gmail.com>2012-04-11 20:32:43 -0500
committerAaron Echols <atechols@gmail.com>2013-01-24 14:33:44 -0700
commita68c70f5355a8f7085158d8048e47c03ac79521e (patch)
treec1bb8e84640cd3fef2620d3495ef4c1eae972c6b /packages/SystemUI/src/com/android/systemui/statusbar/phone
parentdbb1f9b5a2184c23265d77bec41ac94e0bee2824 (diff)
downloadframeworks_base-a68c70f5355a8f7085158d8048e47c03ac79521e.zip
frameworks_base-a68c70f5355a8f7085158d8048e47c03ac79521e.tar.gz
frameworks_base-a68c70f5355a8f7085158d8048e47c03ac79521e.tar.bz2
Show dock battery level if available
Updated for Jellybean. Change-Id: Iabfd12eb327a9fe32ffa46eea5c9038263e105a9
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/phone')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java16
1 files changed, 16 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 8289776..d9a5d63 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -95,6 +95,7 @@ import com.android.systemui.statusbar.NotificationData.Entry;
import com.android.systemui.statusbar.SignalClusterView;
import com.android.systemui.statusbar.StatusBarIconView;
import com.android.systemui.statusbar.policy.BatteryController;
+import com.android.systemui.statusbar.policy.DockBatteryController;
import com.android.systemui.statusbar.policy.BluetoothController;
import com.android.systemui.statusbar.policy.DateView;
import com.android.systemui.statusbar.policy.IntruderAlertView;
@@ -161,9 +162,12 @@ public class PhoneStatusBar extends BaseStatusBar {
// These are no longer handled by the policy, because we need custom strategies for them
BluetoothController mBluetoothController;
BatteryController mBatteryController;
+ DockBatteryController mDockBatteryController;
LocationController mLocationController;
NetworkController mNetworkController;
+ private boolean mHasDockBattery;
+
int mNaturalBarHeight = -1;
int mIconSize = -1;
int mIconHPadding = -1;
@@ -603,6 +607,18 @@ public class PhoneStatusBar extends BaseStatusBar {
mBatteryController = new BatteryController(mContext);
mBatteryController.addIconView((ImageView)mStatusBarView.findViewById(R.id.battery));
mBatteryController.addLabelView((TextView)mStatusBarView.findViewById(R.id.battery_text));
+
+ // Dock Battery support
+ mHasDockBattery = mContext.getResources().getBoolean(
+ com.android.internal.R.bool.config_hasDockBattery);
+
+ if (mHasDockBattery) {
+ mDockBatteryController = new DockBatteryController(mContext);
+ mDockBatteryController.addIconView((ImageView)mStatusBarView.findViewById(R.id.dock_battery));
+ mDockBatteryController.addLabelView(
+ (TextView)mStatusBarView.findViewById(R.id.dock_battery_text));
+ }
+
mNetworkController = new NetworkController(mContext);
mBluetoothController = new BluetoothController(mContext);
final SignalClusterView signalCluster =