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

Commit 0cd1d1d4 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge changes from topic "216302612" 

* changes:
  Change footer action buttons
  Pin footer actions to bottom of QSContainerImpl
  Remove QQS Footer Actions
parents 282f0846 2fb9aa4f

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

+4 −2
Original line number Diff line number Diff line
@@ -19,8 +19,10 @@ 
<com.android.systemui.qs.FooterActionsView

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

    android:layout_width="match_parent"

    android:layout_height="48dp"

    android:gravity="center_vertical">

    android:layout_height="@dimen/qs_footer_height"

    android:gravity="center_vertical"

    android:layout_gravity="bottom"

>



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

        android:id="@+id/multi_user_switch"

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

0 → 100644
+102 −0
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/qs_footer_height"

    android:gravity="center_vertical"

    android:layout_gravity="bottom"

>



    <View

        android:layout_height="1dp"

        android:layout_width="0dp"

        android:layout_weight="1"

        />



    <LinearLayout

        android:layout_height="match_parent"

        android:layout_width="wrap_content"

        >



        <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:layout_marginEnd="@dimen/qs_tile_margin_horizontal"

            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_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:layout_marginEnd="@dimen/qs_tile_margin_horizontal"

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

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

                android:contentDescription="@string/accessibility_quick_settings_settings"

                android:padding="@dimen/qs_footer_icon_padding"

                android:scaleType="centerInside"

                android:src="@drawable/ic_settings"

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



            <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="@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_circle.xml

0 → 100644
+36 −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.

  -->

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

    android:insetTop="@dimen/qs_footer_action_inset"

    android:insetBottom="@dimen/qs_footer_action_inset"

    android:insetLeft="@dimen/qs_footer_action_inset"

    android:insetRight="@dimen/qs_footer_action_inset">

    <ripple

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

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

            <shape android:shape="oval">

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

            </shape>

        </item>

        <item>

            <shape android:shape="oval">

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

            </shape>

        </item>



    </ripple>

</inset>
 
 No newline at end of file

packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml

0 → 100644
+36 −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.

  -->

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

    android:insetTop="@dimen/qs_footer_action_inset"

    android:insetBottom="@dimen/qs_footer_action_inset"

    android:insetLeft="@dimen/qs_footer_action_inset"

    android:insetRight="@dimen/qs_footer_action_inset">

    <ripple

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

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

            <shape android:shape="oval">

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

            </shape>

        </item>

        <item>

            <shape android:shape="oval">

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

            </shape>

        </item>



    </ripple>

</inset>
 
 No newline at end of file

packages/SystemUI/res/layout/qs_footer_impl.xml

+9 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
<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_height="wrap_content"

    android:layout_marginStart="@dimen/qs_footer_margin"

    android:layout_marginEnd="@dimen/qs_footer_margin"

    android:layout_marginBottom="@dimen/qs_footers_margin_bottom"
@@ -36,7 +36,7 @@ 


        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="48dp"

            android:layout_height="@dimen/qs_footer_height"

            android:layout_gravity="center_vertical">



            <TextView
@@ -80,8 +80,13 @@ 


        </LinearLayout>



        <include layout="@layout/footer_actions"

            android:id="@+id/qs_footer_actions"/>

        <ViewStub

            android:id="@+id/footer_stub"

            android:inflatedId="@+id/qs_footer_actions"

            android:layout="@layout/footer_actions"

            android:layout_height="@dimen/qs_footer_height"

            android:layout_width="match_parent"

        />



    </LinearLayout>