Skip to content

Commit e35fec4

Browse files
committed
SystemUI: Improve bouncer layout
Signed-off-by: Anushek Prasal <anushekprasal@gmail.com>
1 parent 72216f4 commit e35fec4

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

packages/SystemUI/res-keyguard/layout/keyguard_bouncer_user_switcher.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
android:orientation="horizontal"
3939
android:layout_height="wrap_content"
4040
android:layout_width="wrap_content"
41-
android:layout_marginTop="30dp">
41+
android:layout_marginTop="24dp">
4242
<TextView
4343
style="@style/Bouncer.UserSwitcher.Spinner.Header"
4444
android:clickable="false"
@@ -47,7 +47,7 @@
4747
android:gravity="center"
4848
android:layout_gravity="center"
4949
android:textAlignment="center"
50-
android:layout_width="@dimen/bouncer_user_switcher_width"
50+
android:layout_width="wrap_content"
5151
android:layout_height="match_parent" />
5252
</com.android.keyguard.KeyguardUserSwitcherAnchor>
5353

packages/SystemUI/res-keyguard/values/dimens.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<dimen name="keyguard_security_view_top_margin">8dp</dimen>
3737

3838
<!-- Minimum bottom margin under the security view -->
39-
<dimen name="keyguard_security_view_bottom_margin">60dp</dimen>
39+
<dimen name="keyguard_security_view_bottom_margin">30dp</dimen>
4040

4141
<!-- Margin above the ambient indication container -->
4242
<dimen name="ambient_indication_container_margin_top">0dp</dimen>
@@ -110,19 +110,19 @@
110110
fading out/in. -->
111111
<dimen name="security_shift_animation_translation">120dp</dimen>
112112

113-
114113
<dimen name="bouncer_user_switcher_header_text_size">15sp</dimen>
115114
<dimen name="bouncer_user_switcher_item_text_size">15sp</dimen>
116115
<dimen name="bouncer_user_switcher_item_line_height">20sp</dimen>
117116
<dimen name="bouncer_user_switcher_item_icon_size">24dp</dimen>
118117
<dimen name="bouncer_user_switcher_item_icon_padding">12dp</dimen>
119-
<dimen name="bouncer_user_switcher_width">120dp</dimen>
118+
<dimen name="bouncer_user_switcher_width">248dp</dimen>
120119
<dimen name="bouncer_user_switcher_popup_header_height">12dp</dimen>
121120
<dimen name="bouncer_user_switcher_popup_divider_height">4dp</dimen>
122121
<dimen name="bouncer_user_switcher_popup_items_divider_height">2dp</dimen>
123-
<dimen name="bouncer_user_switcher_item_padding_vertical">10dp</dimen>
124-
<dimen name="bouncer_user_switcher_item_padding_horizontal">12dp</dimen>
125-
<dimen name="bouncer_user_switcher_header_padding_end">44dp</dimen>
122+
<dimen name="bouncer_user_switcher_item_padding_vertical">8dp</dimen>
123+
<dimen name="bouncer_user_switcher_item_padding_horizontal">8dp</dimen>
124+
<dimen name="bouncer_user_switcher_header_padding_start">20dp</dimen>
125+
<dimen name="bouncer_user_switcher_header_padding_end">48dp</dimen>
126126
<dimen name="bouncer_user_switcher_y_trans">2dp</dimen>
127127

128128
<!-- 2 * the margin + size should equal the plus_margin -->

packages/SystemUI/res-keyguard/values/styles.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@
156156

157157
<style name="Bouncer.UserSwitcher.Spinner.Header">
158158
<item name="android:background">@drawable/bouncer_user_switcher_header_bg</item>
159+
<item name="android:maxWidth">@dimen/bouncer_user_switcher_width</item>
159160
<item name="android:textSize">@dimen/bouncer_user_switcher_header_text_size</item>
161+
<item name="android:paddingStart">@dimen/bouncer_user_switcher_header_padding_start</item>
160162
<item name="android:paddingEnd">@dimen/bouncer_user_switcher_header_padding_end</item>
161163
</style>
162164

0 commit comments

Comments
 (0)