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

Commit 676f86c8 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Finish removing NEW_FOOTER flag" into tm-dev am: 28b4f74b 

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



Change-Id: I6630cafce4bbe9fe832641df8a84dc8f13008f3c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86e71dc8 28b4f74b

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

+4 −3
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 
-->

<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_width="0dp"

    android:layout_height="@dimen/qs_security_footer_single_line_height"

    android:layout_weight="1"

    android:gravity="center"

    android:clickable="true"

    android:visibility="gone">
@@ -26,7 +27,7 @@ 
        android:id="@+id/fgs_text_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginEnd="@dimen/new_qs_footer_action_inset"

        android:layout_marginEnd="@dimen/qs_footer_action_inset"

        android:background="@drawable/qs_security_footer_background"

        android:layout_gravity="end"

        android:gravity="center"
@@ -86,7 +87,7 @@ 
            android:layout_height="12dp"

            android:scaleType="fitCenter"

            android:layout_gravity="bottom|end"

            android:src="@drawable/new_fgs_dot"

            android:src="@drawable/fgs_dot"

            android:contentDescription="@string/fgs_dot_content_description"

            />

    </FrameLayout>

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

+63 −48
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

** Copyright 2021, The Android Open Source Project

** Copyright 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.
@@ -18,65 +18,80 @@ 
<!-- Action buttons for footer in QS/QQS, containing settings button, power off button etc -->

<com.android.systemui.qs.FooterActionsView

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

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/qs_footer_height"

    android:layout_height="@dimen/footer_actions_height"

    android:elevation="@dimen/qs_panel_elevation"

    android:paddingTop="8dp"

    android:paddingBottom="4dp"

    android:background="@drawable/qs_footer_actions_background"

    android:gravity="center_vertical"

    android:layout_gravity="bottom"

>



    <LinearLayout

        android:id="@+id/security_footers_container"

        android:orientation="horizontal"

        android:layout_height="@dimen/qs_footer_action_button_size"

        android:layout_width="0dp"

        android:layout_weight="1"

    />



    <!-- Negative margin equal to -->

    <LinearLayout

        android:layout_height="match_parent"

        android:layout_width="wrap_content"

        android:layout_marginEnd="@dimen/qs_footer_action_inset_negative"

        >



        <com.android.systemui.statusbar.phone.MultiUserSwitch

            android:id="@+id/multi_user_switch"

        android:layout_width="0dp"

            android:layout_width="@dimen/qs_footer_action_button_size"

            android:layout_height="@dimen/qs_footer_action_button_size"

        android:layout_marginEnd="@dimen/qs_tile_margin_horizontal"

        android:layout_weight="1"

        android:background="@drawable/qs_footer_action_chip_background"

            android:background="@drawable/qs_footer_action_circle"

            android:focusable="true">



            <ImageView

                android:id="@+id/multi_user_avatar"

            android:layout_width="@dimen/multi_user_avatar_expanded_size"

            android:layout_height="@dimen/multi_user_avatar_expanded_size"

                android:layout_width="@dimen/qs_footer_icon_size"

                android:layout_height="@dimen/qs_footer_icon_size"

                android:layout_gravity="center"

                android:scaleType="centerInside" />

        </com.android.systemui.statusbar.phone.MultiUserSwitch>



    <com.android.systemui.statusbar.AlphaOptimizedImageView

        android:id="@+id/pm_lite"

        android:layout_width="0dp"

        android:layout_height="@dimen/qs_footer_action_button_size"

        android:layout_marginEnd="@dimen/qs_tile_margin_horizontal"

        android:layout_weight="1"

        android:background="@drawable/qs_footer_action_chip_background"

        android:clickable="true"

        android:clipToPadding="false"

        android:focusable="true"

        android:padding="@dimen/qs_footer_icon_padding"

        android:src="@*android:drawable/ic_lock_power_off"

        android:contentDescription="@string/accessibility_quick_settings_power_menu"

        android:tint="?android:attr/textColorPrimary" />



        <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

            android:id="@+id/settings_button_container"

        android:layout_width="0dp"

            android:layout_width="@dimen/qs_footer_action_button_size"

            android:layout_height="@dimen/qs_footer_action_button_size"

        android:background="@drawable/qs_footer_action_chip_background"

        android:layout_weight="1"

            android:background="@drawable/qs_footer_action_circle"

            android:clipChildren="false"

            android:clipToPadding="false">



            <com.android.systemui.statusbar.phone.SettingsButton

                android:id="@+id/settings_button"

            android:layout_width="match_parent"

            android:layout_height="@dimen/qs_footer_action_button_size"

                android:layout_width="@dimen/qs_footer_icon_size"

                android:layout_height="@dimen/qs_footer_icon_size"

                android:layout_gravity="center"

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

                android:contentDescription="@string/accessibility_quick_settings_settings"

            android:background="@drawable/qs_footer_action_chip_background_borderless"

            android:padding="@dimen/qs_footer_icon_padding"

                android:scaleType="centerInside"

                android:src="@drawable/ic_settings"

                android:tint="?android:attr/textColorPrimary" />



        </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>



        <com.android.systemui.statusbar.AlphaOptimizedImageView

            android:id="@+id/pm_lite"

            android:layout_width="@dimen/qs_footer_action_button_size"

            android:layout_height="@dimen/qs_footer_action_button_size"

            android:background="@drawable/qs_footer_action_circle_color"

            android:clickable="true"

            android:clipToPadding="false"

            android:focusable="true"

            android:padding="@dimen/qs_footer_icon_padding"

            android:src="@*android:drawable/ic_lock_power_off"

            android:contentDescription="@string/accessibility_quick_settings_power_menu"

            android:tint="?androidprv:attr/textColorOnAccent" />



    </LinearLayout>

</com.android.systemui.qs.FooterActionsView>
 
 No newline at end of file

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

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

<!--

** Copyright 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.

-->



<!-- Action buttons for footer in QS/QQS, containing settings button, power off button etc -->

<com.android.systemui.qs.FooterActionsView

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

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/new_footer_height"

    android:elevation="@dimen/qs_panel_elevation"

    android:paddingTop="8dp"

    android:paddingBottom="4dp"

    android:background="@drawable/qs_footer_actions_background"

    android:gravity="center_vertical"

    android:layout_gravity="bottom"

>



    <LinearLayout

        android:id="@+id/security_footers_container"

        android:orientation="horizontal"

        android:layout_height="@dimen/qs_footer_action_button_size"

        android:layout_width="0dp"

        android:layout_weight="1"

    />



    <!-- Negative margin equal to -->

    <LinearLayout

        android:layout_height="match_parent"

        android:layout_width="wrap_content"

        android:layout_marginEnd="@dimen/new_qs_footer_action_inset_negative"

        >



        <com.android.systemui.statusbar.phone.MultiUserSwitch

            android:id="@+id/multi_user_switch"

            android:layout_width="@dimen/qs_footer_action_button_size"

            android:layout_height="@dimen/qs_footer_action_button_size"

            android:background="@drawable/qs_footer_action_circle"

            android:focusable="true">



            <ImageView

                android:id="@+id/multi_user_avatar"

                android:layout_width="@dimen/qs_footer_icon_size"

                android:layout_height="@dimen/qs_footer_icon_size"

                android:layout_gravity="center"

                android:scaleType="centerInside" />

        </com.android.systemui.statusbar.phone.MultiUserSwitch>



        <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

            android:id="@+id/settings_button_container"

            android:layout_width="@dimen/qs_footer_action_button_size"

            android:layout_height="@dimen/qs_footer_action_button_size"

            android:background="@drawable/qs_footer_action_circle"

            android:clipChildren="false"

            android:clipToPadding="false">



            <com.android.systemui.statusbar.phone.SettingsButton

                android:id="@+id/settings_button"

                android:layout_width="@dimen/qs_footer_icon_size"

                android:layout_height="@dimen/qs_footer_icon_size"

                android:layout_gravity="center"

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

                android:contentDescription="@string/accessibility_quick_settings_settings"

                android:scaleType="centerInside"

                android:src="@drawable/ic_settings"

                android:tint="?android:attr/textColorPrimary" />



        </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>



        <com.android.systemui.statusbar.AlphaOptimizedImageView

            android:id="@+id/pm_lite"

            android:layout_width="@dimen/qs_footer_action_button_size"

            android:layout_height="@dimen/qs_footer_action_button_size"

            android:background="@drawable/qs_footer_action_circle_color"

            android:clickable="true"

            android:clipToPadding="false"

            android:focusable="true"

            android:padding="@dimen/qs_footer_icon_padding"

            android:src="@*android:drawable/ic_lock_power_off"

            android:contentDescription="@string/accessibility_quick_settings_power_menu"

            android:tint="?androidprv:attr/textColorOnAccent" />



    </LinearLayout>

</com.android.systemui.qs.FooterActionsView>
 
 No newline at end of file

packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml

deleted100644 → 0
+0 −42
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.

  -->

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

    android:insetTop="@dimen/qs_footer_action_inset"

    android:insetBottom="@dimen/qs_footer_action_inset">

    <ripple

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

        android:height="44dp">

        <item android:id="@android:id/mask">

            <shape android:shape="rectangle">

                <solid android:color="@android:color/white"/>

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

            </shape>

        </item>

        <item>

            <shape android:shape="rectangle">

                <solid android:color="?attr/underSurfaceColor"/>

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

            </shape>

        </item>

        <item>

            <shape android:shape="rectangle">

                <stroke android:width="1dp" android:color="?android:attr/colorBackground"/>

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

            </shape>

        </item>

    </ripple>

</inset>
 
 No newline at end of file