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

Commit 33064f00 authored by Evan Laird's avatar Evan Laird Committed by Automerger Merge Worker
Browse files

Merge changes I8d766f4a,I3f5e212f,Ia78513a0 into tm-qpr-dev am: 7ae85de5 am: 429d9527 

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



Change-Id: I24f6c7969ea142da8b1d32f6cd34767e99758109
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0b31af9d 429d9527

packages/SystemUI/res/layout/keyguard_status_bar.xml

+4 −21
Original line number Diff line number Diff line
@@ -34,30 +34,13 @@ 
        android:paddingTop="@dimen/status_bar_padding_top"

        android:layout_alignParentEnd="true"

        android:gravity="center_vertical|end" >

        <com.android.systemui.statusbar.phone.userswitcher.StatusBarUserSwitcherContainer

            android:id="@+id/user_switcher_container"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="center"

            android:orientation="horizontal"

            android:paddingTop="4dp"

            android:paddingBottom="4dp"

            android:paddingStart="8dp"

            android:paddingEnd="8dp"

            android:background="@drawable/status_bar_user_chip_bg"

            android:visibility="visible" >

            <ImageView android:id="@+id/current_user_avatar"

                android:layout_width="@dimen/multi_user_avatar_keyguard_size"

                android:layout_height="@dimen/multi_user_avatar_keyguard_size"

                android:scaleType="centerInside"

                android:paddingEnd="4dp" />



            <TextView android:id="@+id/current_user_name"

        <include

            android:id="@+id/user_switcher_container"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

                android:textAppearance="@style/TextAppearance.StatusBar.Clock"

                />

        </com.android.systemui.statusbar.phone.userswitcher.StatusBarUserSwitcherContainer>

            android:layout_marginEnd="@dimen/status_bar_user_chip_end_margin"

            layout="@layout/status_bar_user_chip_container" />



        <FrameLayout android:id="@+id/system_icons_container"

            android:layout_width="wrap_content"

packages/SystemUI/res/layout/status_bar.xml

+3 −22
Original line number Diff line number Diff line
@@ -136,31 +136,12 @@ 
                android:gravity="center_vertical|end"

                android:clipChildren="false">



                <com.android.systemui.statusbar.phone.userswitcher.StatusBarUserSwitcherContainer

                <include

                    android:id="@+id/user_switcher_container"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:gravity="center"

                    android:orientation="horizontal"

                    android:paddingTop="4dp"

                    android:paddingBottom="4dp"

                    android:paddingStart="8dp"

                    android:paddingEnd="8dp"

                    android:layout_marginEnd="16dp"

                    android:background="@drawable/status_bar_user_chip_bg"

                    android:visibility="visible" >

                    <ImageView android:id="@+id/current_user_avatar"

                        android:layout_width="@dimen/multi_user_avatar_keyguard_size"

                        android:layout_height="@dimen/multi_user_avatar_keyguard_size"

                        android:scaleType="centerInside"

                        android:paddingEnd="4dp" />



                    <TextView android:id="@+id/current_user_name"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:textAppearance="@style/TextAppearance.StatusBar.Clock"

                        />

                </com.android.systemui.statusbar.phone.userswitcher.StatusBarUserSwitcherContainer>

                    android:layout_marginEnd="@dimen/status_bar_user_chip_end_margin"

                    layout="@layout/status_bar_user_chip_container" />



                <include layout="@layout/system_icons" />

            </com.android.keyguard.AlphaOptimizedLinearLayout>

packages/SystemUI/res/layout/status_bar_user_chip_container.xml

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

<!--

  ~ Copyright (C) 2022 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.

  -->



<com.android.systemui.statusbar.phone.userswitcher.StatusBarUserSwitcherContainer

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

    android:id="@+id/user_switcher_container"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:orientation="horizontal"

    android:layout_marginEnd="@dimen/status_bar_user_chip_end_margin"

    android:background="@drawable/status_bar_user_chip_bg"

    android:visibility="visible" >

    <ImageView android:id="@+id/current_user_avatar"

        android:layout_width="@dimen/status_bar_user_chip_avatar_size"

        android:layout_height="@dimen/status_bar_user_chip_avatar_size"

        android:layout_margin="4dp"

        android:scaleType="centerInside" />



    <TextView android:id="@+id/current_user_name"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:paddingEnd="8dp"

        android:textAppearance="@style/TextAppearance.StatusBar.UserChip"

        />

</com.android.systemui.statusbar.phone.userswitcher.StatusBarUserSwitcherContainer>

packages/SystemUI/res/values/dimens.xml

+5 −0
Original line number Diff line number Diff line
@@ -1422,6 +1422,11 @@ 
    <dimen name="ongoing_call_chip_icon_text_padding">4dp</dimen>

    <dimen name="ongoing_call_chip_corner_radius">28dp</dimen>



    <!-- Status bar user chip -->

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

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

    <dimen name="status_bar_user_chip_text_size">12sp</dimen>



    <!-- Internet panel related dimensions -->

    <dimen name="internet_dialog_list_max_height">662dp</dimen>

    <!-- The height of the WiFi network in Internet panel. -->

packages/SystemUI/res/values/styles.xml

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,12 @@ 
        <item name="android:textColor">@color/status_bar_clock_color</item>

    </style>



    <style name="TextAppearance.StatusBar.UserChip" parent="@*android:style/TextAppearance.StatusBar.Icon">

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

        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>

        <item name="android:textColor">@color/status_bar_clock_color</item>

    </style>



    <style name="TextAppearance.StatusBar.Expanded" parent="@*android:style/TextAppearance.StatusBar">

        <item name="android:textColor">?android:attr/textColorTertiary</item>

    </style>