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

Commit 9a6fa086 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Update QS edit layout. 

- Update TileLayout to lay out tiles rows in a similar fashion to
LinearLayout.
- Update edit screen layout to show rounded corners, margins, and
ensure that QS tiles line up with the tiles in QS.
- Show QS status bar header above the edit screen.

Change-Id: I6c8d644787bf1875ad0d7ad056e9909dc4919ce4
Fixes: 36076720
Test: visual
parent 9f75e089

packages/SystemUI/res/drawable/qs_customizer_background.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ 
    limitations under the License.

-->

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

    <item android:drawable="@color/qs_detail_transition" />

    <item android:drawable="?android:attr/colorPrimary" />

    <item android:drawable="@drawable/qs_customizer_background_transition" />

    <item android:drawable="@drawable/qs_customizer_background_primary" />

</transition>

packages/SystemUI/res/drawable/qs_customizer_background_primary.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 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">

    <shape>

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

        <corners android:radius="?android:attr/dialogCornerRadius" />

    </shape>

</inset>

packages/SystemUI/res/drawable/qs_customizer_background_transition.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 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">

    <shape>

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

        <corners android:radius="?android:attr/dialogCornerRadius" />

    </shape>

</inset>

packages/SystemUI/res/drawable/qs_customizer_toolbar.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 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">

    <shape>

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

        <corners

            android:topLeftRadius="?android:attr/dialogCornerRadius"

            android:topRightRadius="?android:attr/dialogCornerRadius" />

    </shape>

</inset>

packages/SystemUI/res/layout/qs_customize_divider.xml

+1 −2
Original line number Diff line number Diff line
@@ -20,9 +20,8 @@ 
    android:id="@android:id/title"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:paddingTop="20dp"

    android:paddingStart="16dp"

    android:paddingEnd="8dp"

    android:paddingBottom="13dp"

    android:textAppearance="@android:style/TextAppearance.Material.Body2"

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