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

Commit 22fe57a0 authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Android (Google) Code Review
Browse files

Merge changes Ibce9b3c7,Ib83a5666 into sc-dev 

* changes:
  Restore guest item's original behavior in user switcher
  Fix animation bugs in keyguard user switcher
parents 406ca457 6134efab

packages/SystemUI/res/drawable/end_guest_button_background.xml

deleted100644 → 0
+0 −25
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 xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

    <stroke

        android:width="@dimen/end_guest_button_border_size"

        android:color="?android:attr/colorControlHighlight" />

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

</shape>

packages/SystemUI/res/layout/keyguard_user_switcher.xml

+0 −30
Original line number Diff line number Diff line
@@ -30,34 +30,4 @@ 
        android:layout_gravity="top|end"

        android:gravity="end" />



    <LinearLayout

        android:id="@+id/end_guest_button"

        android:layout_height="@dimen/end_guest_button_layout_height"

        android:layout_width="wrap_content"

        android:layout_gravity="center_horizontal|bottom"

        android:layout_centerHorizontal="true"

        android:layout_marginBottom="@dimen/end_guest_button_margin_bottom"

        android:orientation="horizontal"

        android:gravity="center"

        android:paddingLeft="@dimen/end_guest_button_padding_horizontal"

        android:paddingRight="@dimen/end_guest_button_padding_horizontal"

        android:background="@drawable/end_guest_button_background"

        android:visibility="gone">

        <ImageView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="center"

            android:src="@drawable/ic_exit_to_app"

            android:background="@android:color/transparent"

            android:color="?attr/wallpaperTextColor" />

        <TextView

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:gravity="center"

            android:fontFamily="@*android:string/config_bodyFontFamilyMedium"

            android:textColor="?attr/wallpaperTextColor"

            android:textSize="13sp"

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

    </LinearLayout>



</com.android.systemui.statusbar.policy.KeyguardUserSwitcherView>

packages/SystemUI/res/values/dimens.xml

+0 −7
Original line number Diff line number Diff line
@@ -1333,13 +1333,6 @@ 
    <!-- Keyguard user switcher -->

    <dimen name="kg_user_switcher_text_size">16sp</dimen>



    <!-- End guest session button -->

    <dimen name="end_guest_button_layout_height">32dp</dimen>

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

    <dimen name="end_guest_button_margin_bottom">96dp</dimen>

    <dimen name="end_guest_button_border_size">1dp</dimen>

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



    <!-- Opacity at which the background for the shutdown UI will be drawn. -->

    <item name="shutdown_scrim_behind_alpha" format="float" type="dimen">0.95</item>

packages/SystemUI/res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -1121,9 +1121,6 @@ 
    <!-- Name for a freshly added user [CHAR LIMIT=30] -->

    <string name="user_new_user_name">New user</string>



    <!-- Label for button that exits guest session and clears the guest user data [CHAR LIMIT=50]-->

    <string name="guest_exit_button">End guest session</string>



    <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->

    <string name="guest_exit_guest_dialog_title">Remove guest?</string>

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+1 −3
Original line number Diff line number Diff line
@@ -1051,9 +1051,7 @@ public class NotificationPanelViewController extends PanelViewController { 
                    .getVisibleNotificationCount() != 0 || mMediaDataManager.hasActiveMedia();

            mKeyguardStatusViewController.setHasVisibleNotifications(hasVisibleNotifications);

            int userIconHeight = mKeyguardQsUserSwitchController != null

                    ? mKeyguardQsUserSwitchController.getUserIconHeight()

                    : (mKeyguardUserSwitcherController != null

                            ? mKeyguardUserSwitcherController.getUserIconHeight() : 0);

                    ? mKeyguardQsUserSwitchController.getUserIconHeight() : 0;

            mClockPositionAlgorithm.setup(mStatusBarHeaderHeightKeyguard,

                    totalHeight - bottomPadding,

                    mNotificationStackScrollLayoutController.getIntrinsicContentHeight(),