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

Commit 8cb6d423 authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

Wait to reorder players, visual updates 

- Wait until QS is not visible to reorder media players
- Move media players to top/left
- Update layouts for current designs
- reduce number of tiles in QS when media flag is enabled

Test: manual, screenshots at https://drive.google.com/drive/folders/1aLsTJaOuYTdZOo3XFtWsLyvN7UALHyz3?usp=sharing
Change-Id: Ibd5289d3a5fe18bbdde63141d9ef4f247b261836
parent 8a269993

core/res/res/drawable/media_seamless_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    <item android:id="@android:id/background">

        <shape android:shape="rectangle">

            <stroke android:width="1dp" android:color="#1f000000"/>

            <corners android:radius="20dp"/>

            <corners android:radius="24dp"/>

        </shape>

    </item>

</ripple>

packages/SystemUI/res/drawable/qs_media_background.xml

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

<!--

  ~ Copyright (C) 2020 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

  -->

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

    android:shape="rectangle">

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

    <corners

        android:bottomLeftRadius="@dimen/qs_media_corner_radius"

        android:topLeftRadius="@dimen/qs_media_corner_radius"

        android:bottomRightRadius="@dimen/qs_media_corner_radius"

        android:topRightRadius="@dimen/qs_media_corner_radius"

    />

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/media_carousel.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
<HorizontalScrollView

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/qs_media_height"

    android:layout_height="wrap_content"

    android:padding="@dimen/qs_media_padding"

    android:scrollbars="none"

    android:visibility="gone"

packages/SystemUI/res/layout/qqs_media_panel.xml

+9 −19
Original line number Diff line number Diff line
@@ -23,20 +23,25 @@ 
    android:layout_height="match_parent"

    android:orientation="vertical"

    android:gravity="center"

    android:padding="10dp"

    android:paddingTop="16dp"

    android:paddingLeft="16dp"

    android:paddingRight="16dp"

    android:paddingBottom="12dp"

    android:background="@drawable/qs_media_background"

    >

    <!-- Top line: icon + artist name -->

    <!-- Top line: icon + song name -->

    <LinearLayout

        android:orientation="horizontal"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:clipChildren="false"

        android:gravity="center"

        android:layout_marginBottom="12dp"

        >

        <com.android.internal.widget.CachingIconView

            android:id="@+id/icon"

            android:layout_width="15dp"

            android:layout_height="15dp"

            android:layout_width="14dp"

            android:layout_height="14dp"

            android:layout_marginEnd="5dp"

        />

        <TextView
@@ -48,15 +53,6 @@ 
        />

    </LinearLayout>



    <!-- Second line: song name -->

    <TextView

        android:id="@+id/header_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:singleLine="true"

        android:fontFamily="@*android:string/config_bodyFontFamily"

        android:gravity="center"/>



    <!-- Bottom section: controls -->

    <LinearLayout

        android:id="@+id/media_actions"
@@ -70,8 +66,6 @@ 
            style="@android:style/Widget.Material.Button.Borderless.Small"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:padding="8dp"

            android:layout_marginEnd="2dp"

            android:gravity="center"

            android:visibility="gone"

            android:id="@+id/action0"
@@ -80,8 +74,6 @@ 
            style="@android:style/Widget.Material.Button.Borderless.Small"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:padding="8dp"

            android:layout_marginEnd="2dp"

            android:gravity="center"

            android:visibility="gone"

            android:id="@+id/action1"
@@ -90,8 +82,6 @@ 
            style="@android:style/Widget.Material.Button.Borderless.Small"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:padding="8dp"

            android:layout_marginEnd="2dp"

            android:gravity="center"

            android:visibility="gone"

            android:id="@+id/action2"

packages/SystemUI/res/layout/qs_footer_impl.xml

+3 −2
Original line number Diff line number Diff line
@@ -130,9 +130,10 @@ 
    </LinearLayout>

    <View

        android:id="@+id/qs_drag_handle_view"

        android:layout_width="24dp"

        android:layout_width="48dp"

        android:layout_height="4dp"

        android:layout_marginBottom="16dp"

        android:layout_marginTop="8dp"

        android:layout_marginBottom="8dp"

        android:layout_gravity="center_horizontal|bottom"

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