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

Commit ffb69af6 authored by Matt Pietal's avatar Matt Pietal
Browse files

Bouncer User Switcher - Use flags 

The user switcher will be enabled per device, mostly for larger form
factors. Add a flag based on a config value, that can be overlayed or
overriden with the flag app. Also correct some layout issues and
positioning for pin/pw/pattern for larger form factors.

Bug: 206825213
Test: atest KeyguardSecurityContainerTest
Change-Id: Ib8c059bd5739162d3ffe7a1c86fcd757e87701bf
parent e460207e

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

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ 
            android:clipChildren="false"

            android:clipToPadding="false"

            android:paddingTop="@dimen/keyguard_security_view_top_margin"

            android:paddingStart="@dimen/keyguard_security_view_lateral_margin"

            android:paddingEnd="@dimen/keyguard_security_view_lateral_margin"

            android:layout_gravity="center"

            android:gravity="center">

        </com.android.keyguard.KeyguardSecurityViewFlipper>

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
    android:layout_height="match_parent"

    androidprv:layout_maxWidth="@dimen/keyguard_security_width"

    androidprv:layout_maxHeight="@dimen/keyguard_security_height"

    android:layout_gravity="center_horizontal|bottom"

    android:gravity="bottom"

    >

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

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    androidprv:layout_maxWidth="@dimen/keyguard_security_width"

    android:layout_gravity="center_horizontal|bottom"

    android:clipChildren="false"

    android:clipToPadding="false">
@@ -65,6 +66,7 @@ 
        android:orientation="vertical"

        android:layout_gravity="bottom|center_horizontal"

        android:layout_marginTop="@dimen/keyguard_eca_top_margin"

        android:layout_marginBottom="@dimen/keyguard_eca_bottom_margin"

        android:gravity="center_horizontal" />



</com.android.keyguard.KeyguardPatternView>

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        androidprv:layout_maxWidth="@dimen/keyguard_security_width"

        android:layout_gravity="center_horizontal|bottom"

        android:orientation="vertical"

        >

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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        androidprv:layout_maxWidth="@dimen/keyguard_security_width"

        android:gravity="center_horizontal">

        android:layout_gravity="center_horizontal|bottom">



  <Space

      android:layout_width="match_parent"