summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res/layout
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-09-26 20:10:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-26 20:10:20 +0000
commit91949b20c9e430eaba8cf2cf21abe403eb298a94 (patch)
tree6946fdb82fc63c4380c8ce9516a1cf24bc2925a5 /packages/SystemUI/res/layout
parentaeaecacccac2ea9b3db310921707696c56afada4 (diff)
parentcfab99005360819294c65280d8b695ab50c1f0b3 (diff)
downloadframeworks_base-91949b20c9e430eaba8cf2cf21abe403eb298a94.zip
frameworks_base-91949b20c9e430eaba8cf2cf21abe403eb298a94.tar.gz
frameworks_base-91949b20c9e430eaba8cf2cf21abe403eb298a94.tar.bz2
Merge "New battery meter view bolt shape + color." into klp-dev
Diffstat (limited to 'packages/SystemUI/res/layout')
-rw-r--r--packages/SystemUI/res/layout/status_bar.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml
index b3c2f6e..d7312df 100644
--- a/packages/SystemUI/res/layout/status_bar.xml
+++ b/packages/SystemUI/res/layout/status_bar.xml
@@ -95,12 +95,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
- <!-- battery must be padded below by 1px to match assets -->
+ <!-- battery must be padded below by 2px to match assets -->
<com.android.systemui.BatteryMeterView
android:id="@+id/battery"
android:layout_height="16dp"
- android:layout_width="10dp"
- android:paddingBottom="1px"
+ android:layout_width="10.5dp"
+ android:layout_marginBottom="2px"
android:layout_marginStart="4dip"
/>
</LinearLayout>