Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 662da881 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "[Bouncer] Move bouncer title to bottom." into tm-qpr-dev am: 7b0af203 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20346937



Change-Id: I621080b539fd22880b409b169e1a72d7ec3591d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1f06053 7b0af203

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

+2 −0
Original line number Diff line number Diff line
@@ -27,4 +27,6 @@ 
    <integer name="scaled_password_text_size">26</integer>



    <dimen name="bouncer_user_switcher_y_trans">@dimen/status_bar_height</dimen>

    <dimen name="bouncer_user_switcher_view_mode_user_switcher_bottom_margin">0dp</dimen>

    <dimen name="bouncer_user_switcher_view_mode_view_flipper_bottom_margin">0dp</dimen>

</resources>

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

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ 
    <dimen name="bouncer_user_switcher_item_padding_horizontal">12dp</dimen>

    <dimen name="bouncer_user_switcher_header_padding_end">44dp</dimen>

    <dimen name="bouncer_user_switcher_y_trans">0dp</dimen>

    <dimen name="bouncer_user_switcher_view_mode_user_switcher_bottom_margin">0dp</dimen>

    <dimen name="bouncer_user_switcher_view_mode_view_flipper_bottom_margin">0dp</dimen>



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

    <dimen name="user_switcher_icon_large_margin">16dp</dimen>

packages/SystemUI/res/values-sw600dp-port/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
<resources>

    <dimen name="notification_panel_margin_horizontal">48dp</dimen>

    <dimen name="status_view_margin_horizontal">62dp</dimen>

    <dimen name="bouncer_user_switcher_y_trans">20dp</dimen>



    <!-- qs_tiles_page_horizontal_margin should be margin / 2, otherwise full space between two

         pages is margin * 2, and that makes tiles page not appear immediately after user swipes to

packages/SystemUI/res/values-sw720dp-h1000dp/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -21,4 +21,6 @@ 
    <!-- Space between status view and notification shelf -->

    <dimen name="keyguard_status_view_bottom_margin">70dp</dimen>

    <dimen name="keyguard_clock_top_margin">80dp</dimen>

    <dimen name="bouncer_user_switcher_view_mode_user_switcher_bottom_margin">186dp</dimen>

    <dimen name="bouncer_user_switcher_view_mode_view_flipper_bottom_margin">110dp</dimen>

</resources>

packages/SystemUI/res/values-sw720dp-port/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
     for different hardware and product builds. -->

<resources>

    <dimen name="status_view_margin_horizontal">124dp</dimen>

    <dimen name="bouncer_user_switcher_y_trans">200dp</dimen>



    <dimen name="large_screen_shade_header_left_padding">24dp</dimen>

    <dimen name="qqs_layout_padding_bottom">40dp</dimen>