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

Commit 50b665e9 authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

Add compact version of new layout for phone landscape 

Splits the new session layout into collapsed and expanded versions. If
the new layout is being used, the collapsed version will be used in
landscape orientation on smaller devices, and everywhere else will use
the expanded version. No change for the old layout (collapsed version
still used always in QQS and keyguard)

Bug: 209655299
Test: visual - toggle flag, rotate device
Test: atest KeyguardMediaControllerTest QuickQSPanelControllerTest
Change-Id: I5df62996a4823edd19b1bdc217e08cab13d5b7b0
parent 22fa32e3

packages/SystemUI/res/layout/media_session_view.xml

+9 −31
Original line number Diff line number Diff line
@@ -29,14 +29,14 @@ 
    android:theme="@style/MediaPlayer">



    <ImageView

        android:id="@+id/album_art"

        android:layout_width="match_parent"

        android:layout_height="184dp"

        android:layout_height="@dimen/qs_media_session_height_expanded"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        android:translationZ="0dp"

        android:id="@+id/album_art"

        android:scaleType="centerCrop"

        android:adjustViewBounds="true"

        android:clipToOutline="true"
@@ -154,10 +154,7 @@ 
        android:layout_marginStart="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_media_padding"

        android:layout_marginTop="0dp"

        android:layout_marginBottom="0dp"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toBottomOf="@id/media_seamless"

        app:layout_constraintBottom_toTopOf="@id/actionEnd" />

        android:layout_marginBottom="0dp" />



    <ImageButton

        android:id="@+id/actionPrev"
@@ -168,11 +165,8 @@ 
        android:layout_marginEnd="0dp"

        android:layout_marginBottom="0dp"

        android:layout_marginTop="0dp"

        app:layout_constraintHorizontal_chainStyle="packed"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toStartOf="@id/media_progress_bar"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toBottomOf="@id/actionPlayPause" />

        app:layout_constraintHorizontal_bias="1"

        app:layout_constraintHorizontal_chainStyle="packed" />



    <!-- Seek Bar -->

    <!-- As per Material Design on Bidirectionality, this is forced to LTR in code -->
@@ -188,11 +182,7 @@ 
        android:layout_marginBottom="0dp"

        android:layout_marginTop="0dp"

        android:layout_marginStart="0dp"

        android:layout_marginEnd="0dp"

        app:layout_constraintStart_toEndOf="@id/actionPrev"

        app:layout_constraintEnd_toStartOf="@id/actionNext"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toBottomOf="@id/actionPlayPause" />

        android:layout_marginEnd="0dp" />



    <ImageButton

        android:id="@+id/actionNext"
@@ -202,11 +192,7 @@ 
        android:layout_marginStart="0dp"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginBottom="0dp"

        android:layout_marginTop="0dp"

        app:layout_constraintStart_toEndOf="@id/media_progress_bar"

        app:layout_constraintEnd_toStartOf="@id/actionStart"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toBottomOf="@id/actionPlayPause" />

        android:layout_marginTop="0dp" />



    <ImageButton

        android:id="@+id/actionStart"
@@ -216,11 +202,7 @@ 
        android:layout_marginStart="@dimen/qs_media_action_spacing"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginBottom="0dp"

        android:layout_marginTop="0dp"

        app:layout_constraintStart_toEndOf="@id/actionNext"

        app:layout_constraintEnd_toStartOf="@id/actionEnd"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toBottomOf="@id/actionPlayPause" />

        android:layout_marginTop="0dp" />



    <ImageButton

        android:id="@+id/actionEnd"
@@ -231,11 +213,7 @@ 
        android:layout_marginEnd="4dp"

        android:layout_marginBottom="0dp"

        android:layout_marginTop="0dp"

        app:layout_constraintHorizontal_chainStyle="packed"

        app:layout_constraintStart_toEndOf="@id/actionStart"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toBottomOf="@id/actionPlayPause" />

        app:layout_constraintHorizontal_chainStyle="packed" />



    <!-- Long press menu -->

    <TextView

packages/SystemUI/res/values-sw600dp/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 
    <!-- The maximum number of rows in the QuickSettings -->

    <integer name="quick_settings_max_rows">4</integer>



    <!-- Use collapsed layout for media player in landscape QQS -->

    <bool name="config_quickSettingsMediaLandscapeCollapsed">false</bool>



    <!-- Nav bar button default ordering/layout -->

    <string name="config_navBarLayout" translatable="false">left;back,home,recent;right</string>

packages/SystemUI/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ 
        <item>one_handed_mode_enabled:onehanded</item>

    </string-array>



    <!-- Use collapsed layout for media player in landscape QQS -->

    <bool name="config_quickSettingsMediaLandscapeCollapsed">true</bool>



    <!-- Show indicator for Wifi on but not connected. -->

    <bool name="config_showWifiIndicatorWhenEnabled">false</bool>

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -990,6 +990,8 @@ 
    <!-- Sizes for alternate session-based layout -->

    <dimen name="qs_media_session_enabled_seekbar_vertical_padding">15dp</dimen>

    <dimen name="qs_media_session_disabled_seekbar_vertical_padding">16dp</dimen>

    <dimen name="qs_media_session_height_expanded">184dp</dimen>

    <dimen name="qs_media_session_height_collapsed">128dp</dimen>



    <!-- Size of Smartspace media recommendations cards in the QSPanel carousel -->

    <dimen name="qs_aa_media_rec_album_size_collapsed">72dp</dimen>

packages/SystemUI/res/xml/media_session_collapsed.xml

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

<!--

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

  -->

<ConstraintSet

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

    xmlns:app="http://schemas.android.com/apk/res-auto">



    <Constraint

        android:id="@+id/album_art"

        android:layout_width="match_parent"

        android:layout_height="@dimen/qs_media_session_height_collapsed"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent" />



    <Constraint

        android:id="@+id/actionPlayPause"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginEnd="@dimen/qs_media_padding"

        app:layout_constraintStart_toEndOf="@id/actionEnd"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toBottomOf="@id/media_seamless"

        app:layout_constraintBottom_toBottomOf="parent" />



    <Constraint

        android:id="@+id/actionPrev"

        android:layout_width="48dp"

        android:layout_height="48dp"

        app:layout_constraintHorizontal_bias="1"

        app:layout_constraintHorizontal_chainStyle="packed"

        app:layout_constraintStart_toEndOf="@id/header_artist"

        app:layout_constraintEnd_toStartOf="@id/media_progress_bar"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toBottomOf="@id/media_seamless" />



    <Constraint

        android:id="@+id/media_progress_bar"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:visibility="gone"

        app:layout_constraintStart_toEndOf="@id/actionPrev"

        app:layout_constraintEnd_toStartOf="@id/actionNext"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toBottomOf="@id/media_seamless" />



    <Constraint

        android:id="@+id/actionNext"

        android:layout_width="48dp"

        android:layout_height="48dp"

        app:layout_constraintStart_toEndOf="@id/media_progress_bar"

        app:layout_constraintEnd_toStartOf="@id/actionStart"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toBottomOf="@id/media_seamless" />



    <Constraint

        android:id="@+id/actionStart"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:visibility="gone"

        app:layout_constraintStart_toEndOf="@id/actionNext"

        app:layout_constraintEnd_toStartOf="@id/actionEnd"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toBottomOf="@id/media_seamless" />



    <Constraint

        android:id="@+id/actionEnd"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:visibility="gone"

        app:layout_constraintStart_toEndOf="@id/actionStart"

        app:layout_constraintEnd_toStartOf="@id/actionPlayPause"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toBottomOf="@id/media_seamless" />



</ConstraintSet>
 
 No newline at end of file