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

Commit b52642b8 authored by Selim Cinek's avatar Selim Cinek
Browse files

Changed the quick settings layout for media 

Previously media were side by side. Instead it's now
below the QS Tiles.

Bug: 154137987
Test: atest SystemUITests
Change-Id: I5d88ae26ebdae257167982c8fe0cca208032f043
parent 5dbef2d9

packages/SystemUI/res/layout/media_carousel.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:padding="@dimen/qs_media_padding"

    android:scrollbars="none"

    android:fillViewport="true"

    >

    <LinearLayout

        android:id="@+id/media_carousel"

packages/SystemUI/res/layout/qqs_media_panel.xml

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

<!--

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

  -->



<!-- Layout for QQS media controls -->

<LinearLayout

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

    android:id="@+id/qqs_media_controls"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:gravity="center"

    android:paddingTop="16dp"

    android:paddingLeft="16dp"

    android:paddingRight="16dp"

    android:paddingBottom="12dp"

    android:background="@drawable/qs_media_background"

    >

    <!-- 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="14dp"

            android:layout_height="14dp"

            android:layout_marginEnd="5dp"

        />

        <TextView

            android:id="@+id/header_title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

            android:singleLine="true"

        />

    </LinearLayout>



    <!-- Bottom section: controls -->

    <LinearLayout

        android:id="@+id/media_actions"

        android:orientation="horizontal"

        android:layoutDirection="ltr"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="center"

        >

        <ImageButton

            style="@style/MediaPlayer.Button"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:gravity="center"

            android:visibility="gone"

            android:id="@+id/action0"

        />

        <ImageButton

            style="@style/MediaPlayer.Button"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:gravity="center"

            android:visibility="gone"

            android:id="@+id/action1"

        />

        <ImageButton

            style="@style/MediaPlayer.Button"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:gravity="center"

            android:visibility="gone"

            android:id="@+id/action2"

        />

    </LinearLayout>

</LinearLayout>

packages/SystemUI/res/layout/qs_footer_impl.xml

+0 −10
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
    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"

    android:clickable="false"
@@ -128,13 +127,4 @@ 
            </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>

        </com.android.keyguard.AlphaOptimizedLinearLayout>

    </LinearLayout>

    <View

        android:id="@+id/qs_drag_handle_view"

        android:layout_width="48dp"

        android:layout_height="4dp"

        android:layout_marginTop="8dp"

        android:layout_marginBottom="8dp"

        android:layout_gravity="center_horizontal|bottom"

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



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

packages/SystemUI/res/layout/qs_panel.xml

+17 −5
Original line number Diff line number Diff line
@@ -54,20 +54,32 @@ 
        android:layout_marginTop="@*android:dimen/quick_qs_offset_height"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/qs_footer_height"

        android:elevation="4dp"

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

        android:focusable="true"

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

    />

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

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

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



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



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



    <include android:id="@+id/qs_detail" layout="@layout/qs_detail" />



    <include android:id="@+id/qs_customize" layout="@layout/qs_customize_panel"

        android:visibility="gone" />



    <FrameLayout

        android:id="@+id/qs_drag_handle_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal"

        android:elevation="4dp"

        android:paddingBottom="5dp">

        <View

            android:layout_width="46dp"

            android:layout_height="3dp"

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

    </FrameLayout>





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

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+2 −12
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/header"

    android:layout_width="match_parent"

    android:layout_height="@*android:dimen/quick_qs_total_height"

    android:layout_height="wrap_content"

    android:layout_gravity="@integer/notification_panel_layout_gravity"

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

    android:baselineAligned="false"
@@ -29,6 +29,7 @@ 
    android:clipToPadding="false"

    android:paddingTop="0dp"

    android:paddingEnd="0dp"

    android:paddingBottom="10dp"

    android:paddingStart="0dp"

    android:elevation="4dp" >
@@ -45,8 +46,6 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_below="@id/quick_qs_status_icons"

        android:layout_marginStart="@dimen/qs_header_tile_margin_horizontal"

        android:layout_marginEnd="@dimen/qs_header_tile_margin_horizontal"

        android:accessibilityTraversalAfter="@+id/date_time_group"

        android:accessibilityTraversalBefore="@id/expand_indicator"

        android:clipChildren="false"
@@ -54,15 +53,6 @@ 
        android:focusable="true"

        android:importantForAccessibility="yes" />



    <com.android.systemui.statusbar.AlphaOptimizedImageView

        android:id="@+id/qs_detail_header_progress"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:alpha="0"

        android:background="@color/qs_detail_progress_track"

        android:src="@drawable/indeterminate_anim"/>



    <TextView

        android:id="@+id/header_debug_info"

        android:layout_width="wrap_content"