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

Commit 4bb7b1a3 authored by Jason Monk's avatar Jason Monk
Browse files

QS: Update layout to show gear all the time 

Because evidently, when you've gotta change something, you've really
gotta change something.

Bug: 28673919
Change-Id: I085a0424c134a7f80316397b04a6b120440d32c8
parent 22132cb6

packages/SystemUI/res/drawable/ic_mode_edit.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2016 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.

-->

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

        android:width="20.0dp"

        android:height="20.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M3.0,17.25L3.0,21.0l3.75,0.0L17.81,9.94l-3.75,-3.75L3.0,17.25zM20.71,7.04c0.39,-0.3 0.39,-1.02 0.0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0.0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>

</vector>

packages/SystemUI/res/drawable/ic_settings_20dp.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2016 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.

-->

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

    android:width="20dp"

    android:height="20dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

        android:pathData="M19.4,13.0c0.0,-0.3 0.1,-0.6 0.1,-1.0s0.0,-0.7 -0.1,-1.0l2.1,-1.7c0.2,-0.2 0.2,-0.4 0.1,-0.6l-2.0,-3.5C19.5,5.1 19.3,5.0 19.0,5.1l-2.5,1.0c-0.5,-0.4 -1.1,-0.7 -1.7,-1.0l-0.4,-2.6C14.5,2.2 14.2,2.0 14.0,2.0l-4.0,0.0C9.8,2.0 9.5,2.2 9.5,2.4L9.1,5.1C8.5,5.3 8.0,5.7 7.4,6.1L5.0,5.1C4.7,5.0 4.5,5.1 4.3,5.3l-2.0,3.5C2.2,8.9 2.3,9.2 2.5,9.4L4.6,11.0c0.0,0.3 -0.1,0.6 -0.1,1.0s0.0,0.7 0.1,1.0l-2.1,1.7c-0.2,0.2 -0.2,0.4 -0.1,0.6l2.0,3.5C4.5,18.9 4.7,19.0 5.0,18.9l2.5,-1.0c0.5,0.4 1.1,0.7 1.7,1.0l0.4,2.6c0.0,0.2 0.2,0.4 0.5,0.4l4.0,0.0c0.2,0.0 0.5,-0.2 0.5,-0.4l0.4,-2.6c0.6,-0.3 1.2,-0.6 1.7,-1.0l2.5,1.0c0.2,0.1 0.5,0.0 0.6,-0.2l2.0,-3.5c0.1,-0.2 0.1,-0.5 -0.1,-0.6L19.4,13.0zM12.0,15.5c-1.9,0.0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5s3.5,1.6 3.5,3.5S13.9,15.5 12.0,15.5z"

        android:fillColor="#ffffffff" />

</vector>

packages/SystemUI/res/layout/qs_paged_tile_layout.xml

+0 −13
Original line number Diff line number Diff line
@@ -37,19 +37,6 @@ 
            android:importantForAccessibility="yes"

            android:focusable="true" />



        <TextView

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

            style="@style/QSBorderlessButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="end"

            android:minWidth="88dp"

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

            android:textColor="#64FFFFFF"

            android:focusable="true"

            android:text="@string/qs_edit"

            android:contentDescription="@string/accessibility_quick_settings_edit"/>



    </FrameLayout>



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

packages/SystemUI/res/layout/qs_panel.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    <com.android.systemui.qs.QSPanel

            android:id="@+id/quick_settings_panel"

            android:background="#0000"

            android:layout_marginTop="@dimen/status_bar_header_height"

            android:layout_marginTop="80dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingBottom="8dp" />

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+17 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
        android:clipToPadding="false"

        android:orientation="horizontal"

        android:layout_alignParentEnd="true"

        android:layout_marginTop="28dp"

        android:layout_marginTop="4dp"

        android:layout_marginEnd="12dp">



        <com.android.systemui.statusbar.phone.MultiUserSwitch android:id="@+id/multi_user_switch"
@@ -52,6 +52,18 @@ 
                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:clipToPadding="false"

            android:clickable="true"

            android:focusable="true"

            android:src="@drawable/ic_mode_edit"

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

            android:contentDescription="@string/accessibility_quick_settings_edit"

            android:padding="14dp" />



        <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

            android:id="@+id/settings_button_container"

            android:layout_width="48dp"
@@ -64,7 +76,7 @@ 
                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:background="@drawable/ripple_drawable"

                android:src="@drawable/ic_settings"

                android:src="@drawable/ic_settings_20dp"

                android:contentDescription="@string/accessibility_quick_settings_settings" />

            <com.android.systemui.statusbar.AlphaOptimizedImageView android:id="@+id/tuner_icon"

                android:layout_width="match_parent"
@@ -98,7 +110,7 @@ 
        android:layout_alignParentTop="true"

        android:paddingStart="16dp"

        android:paddingEnd="16dp"

        android:paddingTop="8dp"

        android:paddingTop="2dp"

        android:visibility="gone"

        android:textAppearance="@style/TextAppearance.StatusBar.Expanded.EmergencyCallsOnly"

        android:text="@*android:string/emergency_calls_only"
@@ -112,7 +124,7 @@ 
        android:layout_height="wrap_content"

        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true"

        android:layout_marginTop="8dp"

        android:layout_marginTop="16dp"

        android:layout_marginStart="16dp"

        android:gravity="start"

        android:orientation="vertical">
@@ -169,7 +181,7 @@ 
        android:id="@+id/quick_qs_panel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="28dp"

        android:layout_marginTop="52dp"

        android:layout_marginStart="12dp"

        android:layout_marginEnd="12dp"

        android:layout_alignParentEnd="true"