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

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

Merge changes If7fb2450,I36614c86,Ic8bd2d0e,I4062f1f4 into tm-qpr-dev am:... 

Merge changes If7fb2450,I36614c86,Ic8bd2d0e,I4062f1f4 into tm-qpr-dev am: 55395739 am: 65a23661 am: f218f936

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



Change-Id: I5a09fa2330c9b432a20186e8009b11ecd46c44e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f277a5fe f218f936

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

+0 −2
Original line number Diff line number Diff line
@@ -27,6 +27,4 @@ 
    <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

+1 −3
Original line number Diff line number Diff line
@@ -127,9 +127,7 @@ 
    <dimen name="bouncer_user_switcher_item_padding_vertical">10dp</dimen>

    <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>

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



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

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

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

+4 −0
Original line number Diff line number Diff line
@@ -66,4 +66,8 @@ 


    <dimen name="controls_header_horizontal_padding">12dp</dimen>

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



    <!-- Bouncer user switcher margins -->

    <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/values-sw720dp-h1000dp/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,6 +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>

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

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

</resources>

packages/SystemUI/res/values/dimens.xml

+5 −0
Original line number Diff line number Diff line
@@ -1746,4 +1746,9 @@ 
    it is long-pressed.

    -->

    <dimen name="keyguard_long_press_settings_popup_vertical_offset">96dp</dimen>





    <!-- Bouncer user switcher margins -->

    <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>