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

Commit 085add6e authored by Selim Cinek's avatar Selim Cinek Committed by Automerger Merge Worker
Browse files

Merge changes I75a386d7,Ica8c2b14 into rvc-dev am: 02b5b192 

Change-Id: I7a6ab04c0ba4aba4f4412f584642a4c93ac8cee2
parents dd8af4b7 02b5b192

packages/SystemUI/res/layout/qs_media_panel.xml→packages/SystemUI/res/layout/media_view.xml

+4 −25
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
  -->



<!-- Layout for media controls inside QSPanel carousel -->

<androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.systemui.util.animation.TransitionLayout xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:id="@+id/qs_media_controls"

    android:layout_width="match_parent"
@@ -24,18 +24,7 @@ 
    android:clipChildren="false"

    android:clipToPadding="false"

    android:gravity="center_horizontal|fill_vertical"

    app:layoutDescription="@xml/media_scene">



    <View

        android:id="@+id/media_background"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:background="@drawable/qs_media_background"

        app:layout_constraintEnd_toEndOf="@id/view_width"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        />

    android:background="@drawable/qs_media_background">



    <FrameLayout

        android:id="@+id/notification_media_progress_time"
@@ -185,15 +174,5 @@ 
    <!-- Buttons to remove this view when no longer needed -->

    <include

        layout="@layout/qs_media_panel_options"

        android:visibility="gone"

        app:layout_constraintEnd_toEndOf="@id/view_width"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent" />



    <androidx.constraintlayout.widget.Guideline

        android:id="@+id/view_width"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        app:layout_constraintGuide_begin="300dp" />

</androidx.constraintlayout.motion.widget.MotionLayout>
 
        android:visibility="gone" />

</com.android.systemui.util.animation.TransitionLayout>

packages/SystemUI/res/values/ids.xml

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ 
    <item type="id" name="view_width_animator_end_tag"/>

    <item type="id" name="view_width_current_value"/>



    <item type="id" name="requires_remeasuring"/>



    <!-- Whether the icon is from a notification for which targetSdk < L -->

    <item type="id" name="icon_is_pre_L"/>

packages/SystemUI/res/xml/media_collapsed.xml

0 → 100644
+184 −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

  -->

<ConstraintSet

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

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

    <Constraint

        android:id="@+id/icon"

        android:layout_width="16dp"

        android:layout_height="16dp"

        android:layout_marginStart="18dp"

        android:layout_marginTop="22dp"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        />



    <Constraint

        android:id="@+id/app_name"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="10dp"

        android:layout_marginStart="10dp"

        android:layout_marginTop="20dp"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintStart_toEndOf="@id/icon"

        app:layout_constraintEnd_toStartOf="@id/media_seamless"

        app:layout_constraintHorizontal_bias="0"

        />



    <Constraint

        android:id="@+id/media_seamless"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintWidth_min="60dp"

        android:layout_marginTop="@dimen/qs_media_panel_outer_padding"

        android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"

        />



    <Constraint

        android:id="@+id/album_art"

        android:layout_width="@dimen/qs_media_album_size"

        android:layout_height="@dimen/qs_media_album_size"

        android:layout_marginTop="16dp"

        android:layout_marginStart="@dimen/qs_media_panel_outer_padding"

        android:layout_marginBottom="24dp"

        app:layout_constraintTop_toBottomOf="@id/icon"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        />



    <!-- Song name -->

    <Constraint

        android:id="@+id/header_title"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginTop="17dp"

        android:layout_marginStart="16dp"

        app:layout_constraintTop_toBottomOf="@id/app_name"

        app:layout_constraintBottom_toTopOf="@id/header_artist"

        app:layout_constraintStart_toEndOf="@id/album_art"

        app:layout_constraintEnd_toStartOf="@id/action0"

        app:layout_constraintHorizontal_bias="0"/>



    <!-- Artist name -->

    <Constraint

        android:id="@+id/header_artist"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginTop="3dp"

        android:layout_marginBottom="24dp"

        app:layout_constraintTop_toBottomOf="@id/header_title"

        app:layout_constraintStart_toStartOf="@id/header_title"

        app:layout_constraintEnd_toStartOf="@id/action0"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintHorizontal_bias="0"/>



    <!-- Seek Bar -->

    <Constraint

        android:id="@+id/media_progress_bar"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:alpha="0.0"

        app:layout_constraintTop_toBottomOf="@id/album_art"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        android:visibility="gone"

        />



    <Constraint

        android:id="@+id/notification_media_progress_time"

        android:alpha="0.0"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginTop="35dp"

        android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"

        android:layout_marginStart="@dimen/qs_media_panel_outer_padding"

        app:layout_constraintTop_toBottomOf="@id/album_art"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        android:visibility="gone"

        />



    <Constraint

        android:id="@+id/action0"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginStart="4dp"

        android:layout_marginTop="16dp"

        android:visibility="gone"

        app:layout_constraintHorizontal_chainStyle="packed"

        app:layout_constraintTop_toBottomOf="@id/app_name"

        app:layout_constraintLeft_toRightOf="@id/header_title"

        app:layout_constraintRight_toLeftOf="@id/action1"

        >

    </Constraint>



    <Constraint

        android:id="@+id/action1"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginStart="4dp"

        android:layout_marginEnd="4dp"

        android:layout_marginTop="18dp"

        app:layout_constraintTop_toBottomOf="@id/app_name"

        app:layout_constraintLeft_toRightOf="@id/action0"

        app:layout_constraintRight_toLeftOf="@id/action2"

        >

    </Constraint>



    <Constraint

        android:id="@+id/action2"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginStart="4dp"

        android:layout_marginEnd="4dp"

        android:layout_marginTop="18dp"

        app:layout_constraintTop_toBottomOf="@id/app_name"

        app:layout_constraintLeft_toRightOf="@id/action1"

        app:layout_constraintRight_toLeftOf="@id/action3"

        >

    </Constraint>



    <Constraint

        android:id="@+id/action3"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginStart="4dp"

        android:layout_marginEnd="4dp"

        android:layout_marginTop="18dp"

        app:layout_constraintTop_toBottomOf="@id/app_name"

        app:layout_constraintLeft_toRightOf="@id/action2"

        app:layout_constraintRight_toLeftOf="@id/action4"

        >

    </Constraint>



    <Constraint

        android:id="@+id/action4"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginStart="4dp"

        android:layout_marginEnd="4dp"

        android:visibility="gone"

        android:layout_marginTop="18dp"

        app:layout_constraintTop_toBottomOf="@id/app_name"

        app:layout_constraintLeft_toRightOf="@id/action3"

        app:layout_constraintRight_toRightOf="parent"

        >

    </Constraint>

</ConstraintSet>

packages/SystemUI/res/xml/media_expanded.xml

0 → 100644
+178 −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

  -->

<ConstraintSet

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

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

    <Constraint

        android:id="@+id/icon"

        android:layout_width="16dp"

        android:layout_height="16dp"

        android:layout_marginStart="18dp"

        android:layout_marginTop="22dp"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        />



    <Constraint

        android:id="@+id/app_name"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="10dp"

        android:layout_marginStart="10dp"

        android:layout_marginTop="20dp"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintStart_toEndOf="@id/icon"

        app:layout_constraintEnd_toStartOf="@id/media_seamless"

        app:layout_constraintHorizontal_bias="0"

        />



    <Constraint

        android:id="@+id/media_seamless"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintWidth_min="60dp"

        android:layout_marginTop="@dimen/qs_media_panel_outer_padding"

        android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"

        />



    <Constraint

        android:id="@+id/album_art"

        android:layout_width="@dimen/qs_media_album_size"

        android:layout_height="@dimen/qs_media_album_size"

        android:layout_marginTop="14dp"

        android:layout_marginStart="@dimen/qs_media_panel_outer_padding"

        app:layout_constraintTop_toBottomOf="@+id/app_name"

        app:layout_constraintStart_toStartOf="parent"

        />



    <!-- Song name -->

    <Constraint

        android:id="@+id/header_title"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"

        android:layout_marginTop="17dp"

        android:layout_marginStart="16dp"

        app:layout_constraintTop_toBottomOf="@+id/app_name"

        app:layout_constraintStart_toEndOf="@id/album_art"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintHorizontal_bias="0"/>



    <!-- Artist name -->

    <Constraint

        android:id="@+id/header_artist"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"

        android:layout_marginTop="3dp"

        app:layout_constraintTop_toBottomOf="@id/header_title"

        app:layout_constraintStart_toStartOf="@id/header_title"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintHorizontal_bias="0"/>



    <!-- Seek Bar -->

    <Constraint

        android:id="@+id/media_progress_bar"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginTop="3dp"

        app:layout_constraintTop_toBottomOf="@id/header_artist"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        />



    <Constraint

        android:id="@+id/notification_media_progress_time"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginTop="38dp"

        android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"

        android:layout_marginStart="@dimen/qs_media_panel_outer_padding"

        app:layout_constraintTop_toBottomOf="@id/header_artist"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        />



    <Constraint

        android:id="@+id/action0"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginTop="5dp"

        android:layout_marginStart="4dp"

        android:layout_marginEnd="4dp"

        android:layout_marginBottom="@dimen/qs_media_panel_outer_padding"

        app:layout_constraintHorizontal_chainStyle="packed"

        app:layout_constraintLeft_toLeftOf="parent"

        app:layout_constraintRight_toLeftOf="@id/action1"

        app:layout_constraintTop_toBottomOf="@id/notification_media_progress_time"

        app:layout_constraintBottom_toBottomOf="parent">

    </Constraint>



    <Constraint

        android:id="@+id/action1"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginStart="4dp"

        android:layout_marginEnd="4dp"

        android:layout_marginBottom="@dimen/qs_media_panel_outer_padding"

        app:layout_constraintLeft_toRightOf="@id/action0"

        app:layout_constraintRight_toLeftOf="@id/action2"

        app:layout_constraintTop_toTopOf="@id/action0"

        app:layout_constraintBottom_toBottomOf="parent">

    </Constraint>



    <Constraint

        android:id="@+id/action2"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginStart="4dp"

        android:layout_marginEnd="4dp"

        android:layout_marginBottom="@dimen/qs_media_panel_outer_padding"

        app:layout_constraintLeft_toRightOf="@id/action1"

        app:layout_constraintRight_toLeftOf="@id/action3"

        app:layout_constraintTop_toTopOf="@id/action0"

        app:layout_constraintBottom_toBottomOf="parent">

    </Constraint>



    <Constraint

        android:id="@+id/action3"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginStart="4dp"

        android:layout_marginEnd="4dp"

        app:layout_constraintLeft_toRightOf="@id/action2"

        app:layout_constraintRight_toLeftOf="@id/action4"

        app:layout_constraintTop_toTopOf="@id/action0"

        android:layout_marginBottom="@dimen/qs_media_panel_outer_padding"

        app:layout_constraintBottom_toBottomOf="parent">

    </Constraint>



    <Constraint

        android:id="@+id/action4"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginStart="4dp"

        android:layout_marginEnd="4dp"

        android:layout_marginBottom="@dimen/qs_media_panel_outer_padding"

        app:layout_constraintLeft_toRightOf="@id/action3"

        app:layout_constraintRight_toRightOf="parent"

        app:layout_constraintTop_toTopOf="@id/action0"

        app:layout_constraintBottom_toBottomOf="parent">

    </Constraint>

</ConstraintSet>

packages/SystemUI/res/xml/media_scene.xml

deleted100644 → 0
+0 −447

File deleted.

Preview size limit exceeded, changes collapsed.