diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-05-09 22:26:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 22:26:09 +0000 |
| commit | 9d8e968789da2ce70e9c1129be6d28fc1191cbf0 (patch) | |
| tree | f4a45c3a34ecee3c327b88cdf40457be46ba578f /packages/SystemUI/res | |
| parent | a58405ef46d5f7ea563605697c2a4792fc11bd17 (diff) | |
| parent | 1d0861dd6c9e2d48a60680bc1ba2bd274dbf07b6 (diff) | |
| download | frameworks_base-9d8e968789da2ce70e9c1129be6d28fc1191cbf0.zip frameworks_base-9d8e968789da2ce70e9c1129be6d28fc1191cbf0.tar.gz frameworks_base-9d8e968789da2ce70e9c1129be6d28fc1191cbf0.tar.bz2 | |
am c1c89ade: Merge "Move Carrier label into universal status bar header."
* commit 'c1c89ade63dd2252c77a553c92f77b3d74cebde2':
Move Carrier label into universal status bar header.
Diffstat (limited to 'packages/SystemUI/res')
4 files changed, 13 insertions, 10 deletions
diff --git a/packages/SystemUI/res/drawable/notification_header_bg.xml b/packages/SystemUI/res/drawable/notification_header_bg.xml index c5ba18b..b6b2e9a 100644 --- a/packages/SystemUI/res/drawable/notification_header_bg.xml +++ b/packages/SystemUI/res/drawable/notification_header_bg.xml @@ -24,7 +24,7 @@ </item> <item> <shape> - <solid android:color="#ff374248" /> + <solid android:color="#ff384248" /> <corners android:radius="@*android:dimen/notification_quantum_rounded_rect_radius" /> </shape> </item> diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 7308626..d36f692 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -34,15 +34,6 @@ android:layout_gravity="bottom" /> - <com.android.keyguard.CarrierText - android:id="@+id/keyguard_carrier_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="2dp" - android:layout_marginLeft="8dp" - android:ellipsize="marquee" - android:textAppearance="?android:attr/textAppearanceMedium" /> - <include layout="@layout/keyguard_status_view" android:layout_height="wrap_content" diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index 3759f82..ac81e4e 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -65,6 +65,15 @@ /> </RelativeLayout> + <com.android.keyguard.CarrierText + android:id="@+id/keyguard_carrier_text" + android:layout_width="wrap_content" + android:layout_height="@dimen/status_bar_header_height_keyguard" + android:layout_marginLeft="8dp" + android:gravity="center_vertical" + android:ellipsize="marquee" + android:textAppearance="?android:attr/textAppearanceMedium" /> + <FrameLayout android:id="@+id/system_icons_container" android:layout_width="wrap_content" android:layout_height="@dimen/status_bar_header_height" diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 50df706..7c68600 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -158,6 +158,9 @@ <!-- Height of the status bar header bar when expanded --> <dimen name="status_bar_header_height_expanded">144dp</dimen> + <!-- Height of the status bar header bar when on Keyguard --> + <dimen name="status_bar_header_height_keyguard">40dp</dimen> + <!-- Gravity for the notification panel --> <!-- 0x37 = fill_horizontal|top --> <integer name="notification_panel_layout_gravity">0x37</integer> |