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

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

Multi-user bouncer tweaks 

Updates to layout and spacing to match latest UX. Highlight the
selected item in the drop down list.

Bug: 206826027
Test: atest KeyguardSecurityContainerControllerTest KeyguardSecurityContainerTest

Change-Id: I09f372a596eb5ce0b1e5ad701c370ca4ebe3a4b6
parent d9340d58

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

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

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

            android:paddingMode="stack"

            android:paddingStart="44dp"

            android:paddingStart="24dp"

            android:paddingEnd="44dp"

            android:paddingLeft="0dp"

            android:paddingRight="0dp">

    <item>

        <shape android:shape="rectangle">

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

            <corners android:radius="@dimen/keyguard_user_switcher_corner" />

            <corners android:radius="32dp" />

        </shape>

    </item>

    <item

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

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2021 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<shape android:shape="rectangle"

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

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

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

  <corners android:radius="24dp" />

</shape>

packages/SystemUI/res-keyguard/drawable/keyguard_user_switcher_popup_bg.xml→packages/SystemUI/res-keyguard/drawable/bouncer_user_switcher_popup_bg.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 
       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

       android:shape="rectangle">

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

    <corners android:radius="@dimen/keyguard_user_switcher_popup_corner" />

    <corners android:radius="28dp" />

</shape>

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

+5 −6
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 


    <ImageView

        android:id="@+id/user_icon"

        android:layout_width="@dimen/keyguard_user_switcher_icon_size"

        android:layout_height="@dimen/keyguard_user_switcher_icon_size" />

        android:layout_width="@dimen/bouncer_user_switcher_icon_size"

        android:layout_height="@dimen/bouncer_user_switcher_icon_size" />



    <!-- need to keep this outer view in order to have a correctly sized anchor

         for the dropdown menu, as well as dropdown background in the right place -->
@@ -40,13 +40,12 @@ 
        android:orientation="horizontal"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_marginTop="30dp"

        android:minHeight="48dp">

        android:layout_marginTop="30dp">

      <TextView

          style="@style/Keyguard.UserSwitcher.Spinner.Header"

          style="@style/Bouncer.UserSwitcher.Spinner.Header"

          android:clickable="false"

          android:id="@+id/user_switcher_header"

          android:layout_width="@dimen/keyguard_user_switcher_width"

          android:layout_width="@dimen/bouncer_user_switcher_width"

          android:layout_height="wrap_content" />

    </LinearLayout>>

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

+9 −8
Original line number Diff line number Diff line
@@ -13,13 +13,14 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<TextView

<FrameLayout

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

    style="@style/Keyguard.UserSwitcher.Spinner.Item"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">

  <TextView

      style="@style/Bouncer.UserSwitcher.Spinner.Item"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

    android:layout_gravity="start"

    android:paddingStart="@dimen/control_menu_horizontal_padding"

    android:paddingEnd="@dimen/control_menu_horizontal_padding"

    android:textDirection="locale"/>

      android:layout_marginStart="12dp"

      android:layout_marginEnd="12dp" />

</FrameLayout>