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

Commit 4e76d1f3 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Change visuals for expanded QS 

* Moved status icons to the left
* Moved carriers to top right of QS
* Moved edit button to left of QSFooter
* Moved PageIndicator to always be in Footer
* Added build number to footer.

Test: manual using landscape and RTL
Bug: 124464727
Bug: 124466547
Bug: 126759381

Change-Id: I5e5b5bf559d75a8520e772e96b8c4e77ffb72d84
parent a48d2d09

packages/SystemUI/res/layout/mobile_signal_group.xml

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ 
        android:layout_gravity="center_vertical">

        <com.android.systemui.statusbar.AnimatedImageView

            android:id="@+id/mobile_signal"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="@dimen/qs_header_mobile_icon_size"

            android:layout_width="@dimen/qs_header_mobile_icon_size"

            systemui:hasOverlappingRendering="false"

            />

        <ImageView

packages/SystemUI/res/layout/qs_carrier.xml

+7 −10
Original line number Diff line number Diff line
@@ -17,33 +17,30 @@ 
<com.android.systemui.qs.QSCarrier

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

    android:id="@+id/linear_carrier"

    android:layout_width="0dp"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:orientation="horizontal"

    android:layout_weight="1"

    android:gravity="center_vertical|start"

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

    android:clickable="false"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:paddingStart="16dp" >

    android:clipToPadding="false" >



    <include

        layout="@layout/mobile_signal_group"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="8dp"

        android:layout_marginEnd="@dimen/qs_carrier_margin_width"

        android:visibility="gone" />



    <view class="com.android.systemui.qs.QSCarrier$QSCarrierText"

        android:id="@+id/qs_carrier_text"

        android:layout_width="0dp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:ellipsize="marquee"

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

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

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

        android:textDirection="locale"

        android:singleLine="true" />

        android:singleLine="true"

        android:maxEms="7"/>



</com.android.systemui.qs.QSCarrier>
 
 No newline at end of file

packages/SystemUI/res/layout/qs_carrier_group.xml

+10 −12
Original line number Diff line number Diff line
@@ -21,40 +21,38 @@ 
    android:layout_width="0dp"

    android:layout_height="match_parent"

    android:layout_weight="1"

    android:gravity="center_vertical|start"

    android:orientation="horizontal"

    android:layout_marginEnd="32dp">

    android:gravity="end|center_vertical"

    android:orientation="horizontal">





    <include

        layout="@layout/qs_carrier"

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

        android:id="@+id/carrier1"

        android:layout_weight="1"/>



    <View

        android:id="@+id/qs_carrier_divider1"

        android:layout_width="2dp"

        android:layout_width="@dimen/qs_header_carrier_separator_width"

        android:layout_height="match_parent"

        android:layout_marginTop="15dp"

        android:layout_marginBottom="15dp"

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

        android:visibility="gone" />



    <include

        layout="@layout/qs_carrier"

        android:id="@+id/carrier2"

        android:layout_weight="1"

        android:visibility="gone"/>



    <View

        android:id="@+id/qs_carrier_divider2"

        android:layout_width="2dp"

        android:layout_width="@dimen/qs_header_carrier_separator_width"

        android:layout_height="match_parent"

        android:layout_marginTop="15dp"

        android:layout_marginBottom="15dp"

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

        android:layout_weight="1"

        android:visibility="gone" />



    <include

        layout="@layout/qs_carrier"

        android:id="@+id/carrier3"

        android:layout_weight="1"

        android:visibility="gone"/>



</com.android.systemui.qs.QSCarrierGroup>
 
 No newline at end of file

packages/SystemUI/res/layout/qs_footer_impl.xml

+40 −22
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
    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:elevation="4dp"

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

    android:baselineAligned="false"
@@ -41,8 +43,35 @@ 
        android:layout_gravity="center_vertical"

        android:gravity="end" >



        <include layout="@layout/qs_carrier_group"

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

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



            <TextView

                android:id="@+id/build"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:clickable="true"

                android:gravity="center_vertical"

                android:focusable="true"

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

                android:visibility="gone"/>

         </com.android.keyguard.AlphaOptimizedLinearLayout>



        <com.android.systemui.qs.PageIndicator

            android:id="@+id/footer_page_indicator"
@@ -59,8 +88,8 @@ 
            android:gravity="center_vertical|end" >

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

                android:id="@+id/multi_user_switch"

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:layout_width="@dimen/qs_footer_action_button_size"

                android:layout_height="@dimen/qs_footer_action_button_size"

                android:layout_alignParentEnd="true"

                android:background="@drawable/ripple_drawable"

                android:focusable="true">
@@ -70,26 +99,14 @@ 
                    android:layout_width="@dimen/multi_user_avatar_expanded_size"

                    android:layout_height="@dimen/multi_user_avatar_expanded_size"

                    android:layout_gravity="center"

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

                    android:scaleType="centerInside"/>

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



            <com.android.systemui.statusbar.AlphaOptimizedImageView

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

                android:layout_width="48dp"

                android:layout_height="48dp"

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

                android:clickable="true"

                android:clipToPadding="false"

                android:contentDescription="@string/accessibility_quick_settings_edit"

                android:focusable="true"

                android:padding="15dp"

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

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



            <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

                android:id="@+id/settings_button_container"

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:layout_width="@dimen/qs_footer_action_button_size"

                android:layout_height="@dimen/qs_footer_action_button_size"

                android:clipChildren="false"

                android:clipToPadding="false">
@@ -98,10 +115,12 @@ 
                    style="@android:style/Widget.Material.Button.Borderless"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:layout_gravity="center"

                    android:padding="@dimen/qs_footer_icon_padding"

                    android:background="@drawable/ripple_drawable"

                    android:contentDescription="@string/accessibility_quick_settings_settings"

                    android:padding="15dp"

                    android:src="@drawable/ic_settings_16dp"

                    android:src="@drawable/ic_settings"

                    android:scaleType="centerInside"

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



                <com.android.systemui.statusbar.AlphaOptimizedImageView
@@ -117,7 +136,6 @@ 
            </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>

        </com.android.keyguard.AlphaOptimizedLinearLayout>

    </LinearLayout>



    <View

        android:id="@+id/qs_drag_handle_view"

        android:layout_width="24dp"

packages/SystemUI/res/layout/qs_panel.xml

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
        android:elevation="4dp"

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

        android:focusable="true"

        android:accessibilityTraversalBefore="@id/qs_carrier_text"

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

    />



    <include layout="@layout/quick_status_bar_expanded_header" />