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

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

Merge changes from topics "FK_remove_qs_flag", "FK_remove_qs_flag_2" into sc-dev am: b0351d8b 

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

Change-Id: Ie5a37b7606b8e59caf4e787571c481aad9e46d9d
parents 06bb243a b0351d8b

packages/SystemUI/res/layout/qs_customize_panel_content.xml

+0 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ 
            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1"

            android:paddingLeft="@dimen/qs_tile_layout_margin_side"

            android:paddingRight="@dimen/qs_tile_layout_margin_side"

            android:paddingBottom="28dp"

            android:clipToPadding="false"

            android:scrollIndicators="top"

packages/SystemUI/res/layout/qs_footer_impl.xml

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

<!--

** Copyright 2012, The Android Open Source Project

** Copyright 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.
@@ -16,8 +16,7 @@ 
-->



<!-- Extends FrameLayout -->

<com.android.systemui.qs.QSFooterView

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

<com.android.systemui.qs.QSFooterView xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/qs_footer"

    android:layout_width="match_parent"

    android:layout_height="@dimen/qs_footer_height"
@@ -32,41 +31,27 @@ 
    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="center_vertical"

        android:gravity="end" >

        android:orientation="vertical">



        <com.android.keyguard.AlphaOptimizedLinearLayout

            android:id="@+id/qs_footer_actions_edit_container"

            android:layout_width="@integer/qs_footer_actions_width"

            android:layout_height="match_parent"

            android:layout_weight="@integer/qs_footer_actions_weight"

            android:gravity="center_vertical|start" >

            <com.android.systemui.statusbar.AlphaOptimizedImageView

                android:id="@android:id/edit"

                android:layout_width="@dimen/qs_footer_action_button_size"

                android:layout_height="@dimen/qs_footer_action_button_size"

                android:background="?android:attr/selectableItemBackgroundBorderless"

                android:clickable="true"

                android:clipToPadding="false"

                android:contentDescription="@string/accessibility_quick_settings_edit"

                android:focusable="true"

                android:padding="@dimen/qs_footer_icon_padding"

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

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

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="48dp"

            android:layout_gravity="center_vertical">



            <TextView

                android:id="@+id/build"

                android:layout_width="wrap_content"

                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:paddingStart="@dimen/qs_tile_margin_horizontal"

                android:paddingEnd="4dp"

                android:layout_weight="1"

                android:clickable="true"

                android:gravity="center_vertical"

                android:ellipsize="marquee"

                android:focusable="true"

                android:gravity="center_vertical"

                android:singleLine="true"

                android:ellipsize="marquee"

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

                android:layout_marginEnd="4dp"

                android:visibility="gone" />

         </com.android.keyguard.AlphaOptimizedLinearLayout>



            <com.android.systemui.qs.PageIndicator

                android:id="@+id/footer_page_indicator"
@@ -75,34 +60,41 @@ 
                android:layout_gravity="center_vertical"

                android:visibility="gone" />



        <com.android.keyguard.AlphaOptimizedLinearLayout

            android:id="@+id/qs_footer_actions_container"

            android:layout_width="@integer/qs_footer_actions_width"

            <View

                android:layout_width="0dp"

                android:layout_height="match_parent"

            android:layout_weight="@integer/qs_footer_actions_weight"

            android:gravity="center_vertical|end" >

                android:layout_weight="1" />



        </LinearLayout>



        <LinearLayout

            android:id="@+id/qs_footer_actions_container"

            android:layout_width="match_parent"

            android:layout_height="48dp"

            android:gravity="center_vertical">



            <com.android.systemui.statusbar.AlphaOptimizedImageView

                android:id="@+id/pm_lite"

                android:layout_width="@dimen/qs_footer_action_button_size"

                android:id="@android:id/edit"

                android:layout_width="0dp"

                android:layout_height="@dimen/qs_footer_action_button_size"

                android:background="?android:attr/selectableItemBackgroundBorderless"

                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:contentDescription="@string/accessibility_quick_settings_power_menu"

                android:contentDescription="@string/accessibility_quick_settings_edit"

                android:focusable="true"

                android:padding="@dimen/qs_footer_icon_padding"

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

                android:tint="?android:attr/colorForeground"

                android:visibility="gone"

                />

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

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



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

                android:id="@+id/multi_user_switch"

                android:layout_width="@dimen/qs_footer_action_button_size"

                android:layout_width="0dp"

                android:layout_height="@dimen/qs_footer_action_button_size"

                android:layout_alignParentEnd="true"

                android:background="@drawable/ripple_drawable"

                android:layout_marginEnd="@dimen/qs_tile_margin_horizontal"

                android:layout_weight="1"

                android:background="@drawable/qs_footer_action_chip_background"

                android:focusable="true">



                <ImageView
@@ -115,35 +107,53 @@ 


            <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

                android:id="@+id/settings_button_container"

                android:layout_width="@dimen/qs_footer_action_button_size"

                android:layout_width="0dp"

                android:layout_height="@dimen/qs_footer_action_button_size"

                android:layout_marginEnd="@dimen/qs_tile_margin_horizontal"

                android:background="@drawable/qs_footer_action_chip_background"

                android:layout_weight="1"

                android:clipChildren="false"

                android:clipToPadding="false">



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

                    android:id="@+id/settings_button"

                    style="@android:style/Widget.Material.Button.Borderless"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:layout_height="@dimen/qs_footer_action_button_size"

                    android:layout_gravity="center"

                    android:padding="@dimen/qs_footer_icon_padding"

                    android:background="@drawable/ripple_drawable"

                    android:contentDescription="@string/accessibility_quick_settings_settings"

                    android:src="@drawable/ic_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/colorForeground" />



                <com.android.systemui.statusbar.AlphaOptimizedImageView

                    android:id="@+id/tuner_icon"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:paddingStart="36dp"

                    android:paddingEnd="4dp"

                    android:layout_width="8dp"

                    android:layout_height="8dp"

                    android:layout_gravity="center_horizontal|bottom"

                    android:layout_marginBottom="@dimen/qs_footer_icon_padding"

                    android:src="@drawable/tuner"

                    android:tint="?android:attr/textColorTertiary"

                    android:visibility="invisible" />



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

        </com.android.keyguard.AlphaOptimizedLinearLayout>



            <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_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/colorForeground" />



        </LinearLayout>

    </LinearLayout>



</com.android.systemui.qs.QSFooterView>

packages/SystemUI/res/layout/qs_footer_impl_two_lines.xml

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

<!--

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

-->



<!-- Extends FrameLayout -->

<com.android.systemui.qs.QSFooterView xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/qs_footer"

    android:layout_width="match_parent"

    android:layout_height="@dimen/qs_footer_height"

    android:layout_marginStart="@dimen/qs_footer_margin"

    android:layout_marginEnd="@dimen/qs_footer_margin"

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

    android:baselineAligned="false"

    android:clickable="false"

    android:clipChildren="false"

    android:clipToPadding="false">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="48dp"

            android:layout_gravity="center_vertical">



            <TextView

                android:id="@+id/build"

                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:paddingStart="@dimen/qs_tile_margin_horizontal"

                android:paddingEnd="4dp"

                android:layout_weight="1"

                android:clickable="true"

                android:ellipsize="marquee"

                android:focusable="true"

                android:gravity="center_vertical"

                android:singleLine="true"

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

                android:visibility="gone" />



            <com.android.systemui.qs.PageIndicator

                android:id="@+id/footer_page_indicator"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_gravity="center_vertical"

                android:visibility="gone" />



            <View

                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:layout_weight="1" />



        </LinearLayout>



        <LinearLayout

            android:id="@+id/qs_footer_actions_container"

            android:layout_width="match_parent"

            android:layout_height="48dp"

            android:gravity="center_vertical">



            <com.android.systemui.statusbar.AlphaOptimizedImageView

                android:id="@android:id/edit"

                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:contentDescription="@string/accessibility_quick_settings_edit"

                android:focusable="true"

                android:padding="@dimen/qs_footer_icon_padding"

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

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



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

                android:id="@+id/multi_user_switch"

                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: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_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="0dp"

                android:layout_height="@dimen/qs_footer_action_button_size"

                android:layout_marginEnd="@dimen/qs_tile_margin_horizontal"

                android:background="@drawable/qs_footer_action_chip_background"

                android:layout_weight="1"

                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_gravity="center"

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



                <com.android.systemui.statusbar.AlphaOptimizedImageView

                    android:id="@+id/tuner_icon"

                    android:layout_width="8dp"

                    android:layout_height="8dp"

                    android:layout_gravity="center_horizontal|bottom"

                    android:layout_marginBottom="@dimen/qs_footer_icon_padding"

                    android:src="@drawable/tuner"

                    android:tint="?android:attr/textColorTertiary"

                    android:visibility="invisible" />



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



            <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_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/colorForeground" />



        </LinearLayout>

    </LinearLayout>



</com.android.systemui.qs.QSFooterView>

packages/SystemUI/res/layout/qs_paged_page.xml

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

<!--

     Copyright (C) 2015 The Android Open Source Project

     Copyright (C) 2020 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.
@@ -14,8 +14,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<view

    class="com.android.systemui.qs.PagedTileLayout$TilePage"

<com.android.systemui.qs.SideLabelTileLayout

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

    android:id="@+id/tile_page"

    android:layout_width="match_parent"

packages/SystemUI/res/layout/qs_paged_page_side_labels.xml

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

<!--

     Copyright (C) 2020 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.qs.SideLabelTileLayout

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

    android:id="@+id/tile_page"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

    android:clipToPadding="false" />