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

Commit 5af46f32 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update fonts for user switcher" into main

parents 6933c899 5f255614

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

+4 −1
Original line number Diff line number Diff line
@@ -198,6 +198,9 @@ 
    </style>



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

      <item name="android:fontFamily" android:featureFlag="com.android.systemui.lockscreen_font">

        variable-title-medium

      </item>

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

    </style>

</resources>

packages/SystemUI/res/layout/user_switcher_fullscreen.xml

+32 −0
Original line number Diff line number Diff line
@@ -63,6 +63,21 @@ 


    <TextView

        android:id="@+id/cancel"

        android:featureFlag="!com.android.systemui.lockscreen_font"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:gravity="center"

        android:minHeight="48dp"

        android:paddingHorizontal="@dimen/user_switcher_fullscreen_button_padding"

        android:textSize="@dimen/user_switcher_fullscreen_button_text_size"

        android:textColor="?androidprv:attr/colorAccentPrimary"

        android:text="@string/cancel" />



    <TextView

        android:id="@+id/cancel"

        android:featureFlag="com.android.systemui.lockscreen_font"

        android:fontFamily="variable-title-small"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"
@@ -80,6 +95,23 @@ 


    <TextView

        android:id="@+id/add"

        android:featureFlag="!com.android.systemui.lockscreen_font"

        android:background="@drawable/user_switcher_fullscreen_button_bg"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:gravity="center"

        android:paddingHorizontal="@dimen/user_switcher_fullscreen_button_padding"

        android:text="@string/add"

        android:textColor="?androidprv:attr/colorAccentPrimary"

        android:textSize="@dimen/user_switcher_fullscreen_button_text_size"

        android:visibility="gone"

        android:minHeight="48dp" />



    <TextView

        android:id="@+id/add"

        android:featureFlag="com.android.systemui.lockscreen_font"

        android:fontFamily="variable-title-small"

        android:background="@drawable/user_switcher_fullscreen_button_bg"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

packages/SystemUI/res/layout/user_switcher_fullscreen_popup_item.xml

+11 −0
Original line number Diff line number Diff line
@@ -39,6 +39,17 @@ 


    <TextView

        android:id="@+id/text"

        android:featureFlag="!com.android.systemui.lockscreen_font"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textColor="@color/user_switcher_fullscreen_popup_item_tint"

        android:textSize="14sp"

        android:layout_gravity="start" />



    <TextView

        android:id="@+id/text"

        android:featureFlag="com.android.systemui.lockscreen_font"

        android:fontFamily="variable-title-small"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textColor="@color/user_switcher_fullscreen_popup_item_tint"