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

Commit b7485faa authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Update media long press menu" into tm-dev am: 501f0163 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17260367

Change-Id: I9f8b04a3cca0184e4500c7dbca6aef3fae4b00e9
parents 7bf4504f 501f0163

packages/SystemUI/res/drawable/qs_media_solid_button.xml

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

  -->

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

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

        android:shape="rectangle">

        <solid android:color="?androidprv:attr/colorAccentPrimaryVariant" />

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

        <padding

            android:left="16dp"

            android:right="16dp"

            android:top="8dp"

            android:bottom="8dp" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/media_session_view.xml

+29 −37
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ 
    <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/qs_media_padding"

        android:layout_marginTop="0dp"

        android:layout_marginStart="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_media_padding"

        android:id="@+id/remove_text"
@@ -274,64 +274,56 @@ 
        android:marqueeRepeatLimit="marquee_forever"

        android:text="@string/controls_media_close_session"

        android:gravity="center_horizontal|top"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintTop_toBottomOf="@id/settings"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

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



    <FrameLayout

    <ImageButton

        android:id="@+id/settings"

        android:background="@drawable/qs_media_light_source"

        android:src="@drawable/ic_settings"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginBottom="@dimen/qs_media_padding"

        app:layout_constrainedWidth="true"

        android:layout_marginTop="4dp"

        android:layout_marginEnd="4dp"

        android:background="@drawable/qs_media_light_source"

        android:contentDescription="@string/controls_media_settings_button"

        android:layout_gravity="top"

        app:layout_constraintWidth_min="@dimen/min_clickable_item_size"

        app:layout_constraintHeight_min="@dimen/min_clickable_item_size"

        app:layout_constraintHorizontal_chainStyle="spread_inside"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toStartOf="@id/cancel"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toBottomOf="@id/remove_text">

        <TextView

            android:id="@+id/settings_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center|bottom"

            style="@style/MediaPlayer.OutlineButton"

            android:text="@string/controls_media_settings_button" />

    </FrameLayout>

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent">

    </ImageButton>



    <FrameLayout

        android:id="@+id/cancel"

        android:id="@+id/dismiss"

        android:background="@drawable/qs_media_light_source"

        android:layout_width="0dp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/qs_media_action_spacing"

        android:layout_marginStart="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginBottom="@dimen/qs_media_padding"

        app:layout_constrainedWidth="true"

        app:layout_constraintWidth_min="@dimen/min_clickable_item_size"

        app:layout_constraintHeight_min="@dimen/min_clickable_item_size"

        app:layout_constraintStart_toEndOf="@id/settings"

        app:layout_constraintEnd_toStartOf="@id/dismiss"

        app:layout_constraintHorizontal_chainStyle="packed"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toStartOf="@id/cancel"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toBottomOf="@id/remove_text">

        <TextView

            android:id="@+id/cancel_text"

            android:id="@+id/dismiss_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center|bottom"

            style="@style/MediaPlayer.OutlineButton"

            android:text="@string/cancel" />

            android:layout_gravity="center|top"

            style="@style/MediaPlayer.SolidButton"

            android:background="@drawable/qs_media_solid_button"

            android:text="@string/controls_media_dismiss_button" />

    </FrameLayout>



    <FrameLayout

        android:id="@+id/dismiss"

        android:id="@+id/cancel"

        android:background="@drawable/qs_media_light_source"

        android:layout_width="0dp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/qs_media_action_spacing"

        android:layout_marginEnd="@dimen/qs_media_padding"
@@ -339,16 +331,16 @@ 
        app:layout_constrainedWidth="true"

        app:layout_constraintWidth_min="@dimen/min_clickable_item_size"

        app:layout_constraintHeight_min="@dimen/min_clickable_item_size"

        app:layout_constraintStart_toEndOf="@id/cancel"

        app:layout_constraintStart_toEndOf="@id/dismiss"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toBottomOf="@id/remove_text">

        <TextView

            android:id="@+id/dismiss_text"

            android:id="@+id/cancel_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center|bottom"

            android:layout_gravity="center|top"

            style="@style/MediaPlayer.OutlineButton"

            android:text="@string/controls_media_dismiss_button" />

            android:text="@string/cancel" />

    </FrameLayout>

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

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -2140,11 +2140,11 @@ 
    <!-- Title for media controls [CHAR_LIMIT=50] -->

    <string name="controls_media_title">Media</string>

    <!-- Explanation for closing controls associated with a specific media session [CHAR_LIMIT=50] -->

    <string name="controls_media_close_session">Hide this media session?</string>

    <string name="controls_media_close_session">Hide this media control for <xliff:g id="app_name" example="YouTube Music">%1$s</xliff:g>?</string>

    <!-- Explanation that controls associated with a specific media session are active [CHAR_LIMIT=50] -->

    <string name="controls_media_active_session">The current media session cannot be hidden.</string>

    <!-- Label for a button that will hide media controls [CHAR_LIMIT=30] -->

    <string name="controls_media_dismiss_button">Dismiss</string>

    <string name="controls_media_dismiss_button">Hide</string>

    <!-- Label for button to resume media playback [CHAR_LIMIT=NONE] -->

    <string name="controls_media_resume">Resume</string>

    <!-- Label for button to go to media control settings screen [CHAR_LIMIT=30] -->

packages/SystemUI/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ 
    </style>



    <style name="MediaPlayer.OutlineButton">

        <item name="android:background">@drawable/qs_media_button_background</item>

        <item name="android:background">@drawable/qs_media_outline_button</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:backgroundTint">@color/media_player_outline_button_bg</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>