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

Commit 4f3f5523 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Update qs footer to 56dp. 

- Update qs footer icons to 18dp
- Animate out drag handle when QS footer is expanded
- Change the qs footer actions container to optimize for alpha
animations.

Bug: 72382393
Bug: 73312177
Test: visual
Change-Id: If2700d4ae13612924443712b2b03fb7660b36681
parent 40ce0958

packages/SystemUI/res/layout/qs_footer_impl.xml

+10 −13
Original line number Diff line number Diff line
@@ -71,23 +71,19 @@ 
                android:singleLine="true" />

        </LinearLayout>



        <FrameLayout

            android:layout_width="24dp"

            android:layout_height="match_parent" >

        <View

            android:id="@+id/qs_drag_handle_view"

                android:layout_width="match_parent"

            android:layout_width="24dp"

            android:layout_height="4dp"

                android:layout_marginTop="28dp"

            android:layout_gravity="center"

            android:background="@drawable/qs_footer_drag_handle" />

        </FrameLayout>



        <LinearLayout

        <com.android.keyguard.AlphaOptimizedLinearLayout

            android:id="@+id/qs_footer_actions_container"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:gravity="end" >

            android:gravity="center_vertical|end" >

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

                android:id="@+id/multi_user_switch"

                android:layout_width="48dp"
@@ -113,7 +109,7 @@ 
                android:clipToPadding="false"

                android:contentDescription="@string/accessibility_quick_settings_edit"

                android:focusable="true"

                android:padding="16dp"

                android:padding="15dp"

                android:src="@drawable/ic_mode_edit"

                android:tint="?android:attr/colorForeground"/>
@@ -131,6 +127,7 @@ 
                    android:layout_height="match_parent"

                    android:background="@drawable/ripple_drawable"

                    android:contentDescription="@string/accessibility_quick_settings_settings"

                    android:padding="15dp"

                    android:src="@drawable/ic_settings_16dp"

                    android:tint="?android:attr/colorForeground"/>
@@ -145,7 +142,7 @@ 
                    android:visibility="invisible"/>



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

        </LinearLayout>

        </com.android.keyguard.AlphaOptimizedLinearLayout>

    </LinearLayout>



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

packages/SystemUI/res/values/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ 


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

         etc. -->

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

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



    <!-- The padding between the notifications and the quick settings container -->

    <dimen name="qs_notification_padding">@dimen/notification_side_paddings</dimen>
@@ -337,7 +337,7 @@ 
    <dimen name="qs_footer_padding_end">24dp</dimen>

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

    <!-- Difference between drag handle margin in QQS and expanded QS -->

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

    <dimen name="qs_footer_drag_handle_offset">10dp</dimen>



    <dimen name="qs_notif_collapsed_space">64dp</dimen>
@@ -513,7 +513,7 @@ 
    <dimen name="multi_user_avatar_keyguard_size">22dp</dimen>



    <!-- The width of user avatar when expanded -->

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

    <dimen name="multi_user_avatar_expanded_size">18dp</dimen>



    <!-- The font size of the time when collapsed in QS -->

    <dimen name="qs_time_collapsed_size">14sp</dimen>

packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -174,7 +174,8 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
                .addFloat(mDivider, "alpha", 0, 1)

                .addFloat(mCarrierText, "alpha", 0, 1)

                .addFloat(mActionsContainer, "alpha", 0, 1)

                .addFloat(mDragHandle, "translationY", 0, -mDragHandleExpandOffset)

                .addFloat(mDragHandle, "translationY", mDragHandleExpandOffset, 0)

                .addFloat(mDragHandle, "alpha", 1, 0)

                .build();

    }