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

Commit d976ead7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bouncer - Portrait user switcher tweaks" into tm-dev am: 9d39a4c3 

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

Change-Id: I135f002182a5f41b98667959b076e7b0091a88a0
parents 4f185209 9d39a4c3

packages/SystemUI/res-keyguard/drawable/bouncer_user_switcher_header_bg.xml

+2 −4
Original line number Original line Diff line number Diff line
@@ -17,10 +17,8 @@ 
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"

<layer-list xmlns:android="http://schemas.android.com/apk/res/android"

            xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

            xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

            android:paddingMode="stack"

            android:paddingMode="stack"

            android:paddingStart="24dp"

            android:paddingStart="0dp"

            android:paddingEnd="44dp"

            android:paddingEnd="0dp">

            android:paddingLeft="0dp"

            android:paddingRight="0dp">

    <item>

    <item>

        <shape android:shape="rectangle">

        <shape android:shape="rectangle">

          <solid android:color="?androidprv:attr/colorSurface" />

          <solid android:color="?androidprv:attr/colorSurface" />

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -26,4 +26,6 @@ 




    <!-- The size of PIN text in the PIN unlock method. -->

    <!-- The size of PIN text in the PIN unlock method. -->

    <integer name="scaled_password_text_size">26</integer>

    <integer name="scaled_password_text_size">26</integer>



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

</resources>
 
</resources>

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -117,6 +117,8 @@ 
    <dimen name="bouncer_user_switcher_popup_divider_height">4dp</dimen>

    <dimen name="bouncer_user_switcher_popup_divider_height">4dp</dimen>

    <dimen name="bouncer_user_switcher_item_padding_vertical">10dp</dimen>

    <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_item_padding_horizontal">12dp</dimen>

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

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





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

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

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

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

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -155,6 +155,7 @@ 
    <style name="Bouncer.UserSwitcher.Spinner.Header">

    <style name="Bouncer.UserSwitcher.Spinner.Header">

        <item name="android:background">@drawable/bouncer_user_switcher_header_bg</item>

        <item name="android:background">@drawable/bouncer_user_switcher_header_bg</item>

        <item name="android:textSize">@dimen/bouncer_user_switcher_header_text_size</item>

        <item name="android:textSize">@dimen/bouncer_user_switcher_header_text_size</item>

        <item name="android:paddingEnd">@dimen/bouncer_user_switcher_header_padding_end</item>

    </style>

    </style>





    <style name="Bouncer.UserSwitcher.Spinner.Item">

    <style name="Bouncer.UserSwitcher.Spinner.Item">

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,4 +19,5 @@ 
    <dimen name="status_view_margin_horizontal">62dp</dimen>

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

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

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

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

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

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

</resources>
 
</resources>