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

Commit d2b9b747 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Pin footer actions to bottom of QSContainerImpl 

These pins the actions and decouples the FooterAction controller from
Footer controller. Pinning the actions is behind a flag, because the UI
is not finalized.

Fixes: 216302612
Test: atest com.android.systemui.qs com.android.systemui.statusbar.phone
Test: manual in different screen sizes

Change-Id: I0cd24596d0b900b2555202f59047ebad5c969afb
parent 1cbf6001

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

packages/SystemUI/res/layout/qs_panel.xml

+9 −0
Original line number Diff line number Diff line
@@ -51,6 +51,15 @@ 
        android:id="@+id/qs_detail"

        layout="@layout/qs_detail" />



    <ViewStub

        android:id="@+id/container_stub"

        android:inflatedId="@+id/qs_footer_actions"

        android:layout="@layout/footer_actions"

        android:layout_height="@dimen/qs_footer_height"

        android:layout_width="match_parent"

        android:layout_gravity="bottom"

        />



    <include

        android:id="@+id/qs_customize"

        layout="@layout/qs_customize_panel"

packages/SystemUI/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ 


    <!-- The height of the quick settings footer that holds the user switcher, settings icon,

         etc. -->

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

    <dimen name="qs_footer_height">48dp</dimen>



    <!-- The size of each of the icon buttons in the QS footer -->

    <dimen name="qs_footer_action_button_size">48dp</dimen>
@@ -490,7 +490,7 @@ 
    <dimen name="qs_tile_text_size">14sp</dimen>

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

    <dimen name="qs_dual_tile_padding_horizontal">6dp</dimen>

    <dimen name="qs_panel_padding_bottom">0dp</dimen>

    <dimen name="qs_panel_padding_bottom">@dimen/qs_footer_height</dimen>

    <dimen name="qs_panel_padding_top">48dp</dimen>

    <dimen name="qs_detail_header_padding">0dp</dimen>

    <dimen name="qs_detail_image_width">56dp</dimen>

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

+2 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ public class Flags { 
    public static final ResourceBooleanFlag QS_USER_DETAIL_SHORTCUT =

            new ResourceBooleanFlag(503, R.bool.flag_lockscreen_qs_user_detail_shortcut);



    public static final BooleanFlag NEW_FOOTER = new BooleanFlag(504, false);



    /***************************************/

    // 600- status bar

    public static final BooleanFlag COMBINED_STATUS_BAR_SIGNAL_ICONS =