diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-05-26 14:23:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-26 14:23:38 +0000 |
| commit | 37e65624210d470b47025940ebb65a1ef8ccecdf (patch) | |
| tree | ec2f448082acd5c2d860f9d2e36fae7741a9b582 /packages/SystemUI | |
| parent | 2a87343a8ec54d73c5c48fb95ff31234a264a026 (diff) | |
| parent | cc12a9daf6e092f217c4a208b4734304a6ec187c (diff) | |
| download | frameworks_base-37e65624210d470b47025940ebb65a1ef8ccecdf.zip frameworks_base-37e65624210d470b47025940ebb65a1ef8ccecdf.tar.gz frameworks_base-37e65624210d470b47025940ebb65a1ef8ccecdf.tar.bz2 | |
Merge "Visual refinements for lockscreen." into lmp-preview-dev
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/res/layout/keyguard_bottom_area.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded_header.xml | 20 | ||||
| -rw-r--r-- | packages/SystemUI/res/values-sw600dp/dimens.xml | 4 |
3 files changed, 15 insertions, 12 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index 2ec3766..21e5390 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -53,7 +53,8 @@ android:layout_marginBottom="100dp" android:layout_gravity="bottom|center_horizontal" android:textStyle="italic" - android:textAppearance="?android:attr/textAppearanceMedium"/> + android:textColor="#ffffff" + android:textAppearance="?android:attr/textAppearanceSmall"/> <ImageView android:id="@+id/lock_icon" diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index 1290e5c..dfc3b22 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -65,15 +65,6 @@ /> </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" /> - <com.android.systemui.statusbar.phone.MultiUserSwitch android:id="@+id/multi_user_switch" android:layout_width="40dp" android:layout_height="@dimen/status_bar_header_height" @@ -98,6 +89,17 @@ android:layout_marginEnd="4dp" /> + <com.android.keyguard.CarrierText + android:id="@+id/keyguard_carrier_text" + android:layout_width="match_parent" + android:layout_height="@dimen/status_bar_header_height_keyguard" + android:layout_marginLeft="8dp" + android:layout_toStartOf="@id/system_icons_container" + android:gravity="center_vertical" + android:ellipsize="marquee" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="#ffffff" /> + <include layout="@layout/quick_settings_brightness_dialog" android:id="@+id/brightness_container" diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml index 22815f3..5750faa 100644 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -57,6 +57,6 @@ <!-- The margin between the clock and the notifications on Keyguard. See keyguard_clock_height_fraction_* for the difference between min and max.--> - <dimen name="keyguard_clock_notifications_margin_min">32dp</dimen> - <dimen name="keyguard_clock_notifications_margin_max">32dp</dimen> + <dimen name="keyguard_clock_notifications_margin_min">36dp</dimen> + <dimen name="keyguard_clock_notifications_margin_max">36dp</dimen> </resources> |