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

Commit dc0b2970 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove old footer actions implementation" into tm-qpr-dev am: 3c86fce3 

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



Change-Id: I76810bd8744e557b154162de6dbaaa4655d6c337
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5a597e25 3c86fce3

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

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

-->

<!-- TODO(b/242040009): Remove this file. -->

<FrameLayout

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

    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">



    <LinearLayout

        android:id="@+id/fgs_text_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginEnd="@dimen/qs_footer_action_inset"

        android:background="@drawable/qs_security_footer_background"

        android:layout_gravity="end"

        android:gravity="center"

        android:paddingHorizontal="@dimen/qs_footer_padding"

        >



        <ImageView

            android:id="@+id/primary_footer_icon"

            android:layout_width="@dimen/qs_footer_icon_size"

            android:layout_height="@dimen/qs_footer_icon_size"

            android:gravity="start"

            android:layout_marginEnd="12dp"

            android:contentDescription="@null"

            android:src="@drawable/ic_info_outline"

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



        <TextView

            android:id="@+id/footer_text"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:maxLines="1"

            android:ellipsize="end"

            android:textAppearance="@style/TextAppearance.QS.SecurityFooter"

            android:textColor="?android:attr/textColorSecondary"/>



        <ImageView

            android:id="@+id/fgs_new"

            android:layout_width="12dp"

            android:layout_height="12dp"

            android:scaleType="fitCenter"

            android:src="@drawable/fgs_dot"

            android:contentDescription="@string/fgs_dot_content_description"

            />



        <ImageView

            android:id="@+id/footer_icon"

            android:layout_width="@dimen/qs_footer_icon_size"

            android:layout_height="@dimen/qs_footer_icon_size"

            android:layout_marginStart="8dp"

            android:contentDescription="@null"

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

            android:autoMirrored="true"

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

    </LinearLayout>



    <FrameLayout

        android:id="@+id/fgs_number_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:focusable="true"

        android:visibility="gone">



        <TextView

            android:id="@+id/fgs_number"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textAppearance="@style/TextAppearance.QS.SecurityFooter"

            android:layout_gravity="center"

            android:textColor="?android:attr/textColorPrimary"

            android:textSize="18sp"/>

        <ImageView

            android:id="@+id/fgs_collapsed_new"

            android:layout_width="12dp"

            android:layout_height="12dp"

            android:scaleType="fitCenter"

            android:layout_gravity="bottom|end"

            android:src="@drawable/fgs_dot"

            android:contentDescription="@string/fgs_dot_content_description"

            />

    </FrameLayout>



</FrameLayout>
 
 No newline at end of file

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

+2 −74
Original line number Diff line number Diff line
@@ -16,10 +16,8 @@ 
-->



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

<!-- TODO(b/242040009): Clean up this file. -->

<com.android.systemui.qs.FooterActionsView

<LinearLayout

    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/footer_actions_height"

    android:elevation="@dimen/qs_panel_elevation"
@@ -28,74 +26,4 @@ 
    android:background="@drawable/qs_footer_actions_background"

    android:gravity="center_vertical|end"

    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"

/>
 
 No newline at end of file
 


    <!-- 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="@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:focusable="false"

                android:clickable="false"

                android:importantForAccessibility="yes"

                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/layout/quick_settings_security_footer.xml

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

<!--

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

-->

<!-- TODO(b/242040009): Remove this file. -->

<LinearLayout

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

    android:layout_width="0dp"

    android:layout_height="@dimen/qs_security_footer_single_line_height"

    android:layout_weight="1"

    android:clickable="true"

    android:orientation="horizontal"

    android:paddingHorizontal="@dimen/qs_footer_padding"

    android:gravity="center_vertical"

    android:layout_gravity="center_vertical|center_horizontal"

    android:layout_marginEnd="@dimen/qs_footer_action_inset"

    android:background="@drawable/qs_security_footer_background"

    >



    <ImageView

        android:id="@+id/primary_footer_icon"

        android:layout_width="@dimen/qs_footer_icon_size"

        android:layout_height="@dimen/qs_footer_icon_size"

        android:gravity="start"

        android:layout_marginEnd="12dp"

        android:contentDescription="@null"

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



    <TextView

        android:id="@+id/footer_text"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:singleLine="true"

        android:ellipsize="end"

        android:textAppearance="@style/TextAppearance.QS.SecurityFooter"

        android:textColor="?android:attr/textColorSecondary"/>



    <ImageView

        android:id="@+id/footer_icon"

        android:layout_width="@dimen/qs_footer_icon_size"

        android:layout_height="@dimen/qs_footer_icon_size"

        android:layout_marginStart="8dp"

        android:contentDescription="@null"

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

        android:autoMirrored="true"

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



</LinearLayout>

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −3
Original line number Diff line number Diff line
@@ -204,9 +204,6 @@ object Flags { 
            "full_screen_user_switcher"

        )



    // TODO(b/254512678): Tracking Bug

    @JvmField val NEW_FOOTER_ACTIONS = releasedFlag(507, "new_footer_actions")



    // TODO(b/244064524): Tracking Bug

    @JvmField

    val QS_SECONDARY_DATA_SUB_INFO =

packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt

+0 −6
Original line number Diff line number Diff line
@@ -122,10 +122,6 @@ interface FgsManagerController { 
    /** Remove a [OnDialogDismissedListener]. */

    fun removeOnDialogDismissedListener(listener: OnDialogDismissedListener)



    /** Whether we should update the footer visibility. */

    // TODO(b/242040009): Remove this.

    fun shouldUpdateFooterVisibility(): Boolean



    @VisibleForTesting

    fun visibleButtonsCount(): Int
@@ -375,8 +371,6 @@ class FgsManagerControllerImpl @Inject constructor( 
        }

    }



    override fun shouldUpdateFooterVisibility() = dialog == null



    override fun showDialog(expandable: Expandable?) {

        synchronized(lock) {

            if (dialog == null) {