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

Commit 1d53e823 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Reduce device fallback to just icon" into rvc-dev

parents c8f4a8a5 0734043a

packages/SystemUI/res/drawable/ic_hardware_speaker.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<!--

    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.

-->

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

    android:width="18dp"

    android:height="18dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:pathData="M17,2L7,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,1.99 2,1.99L17,22c1.1,0 2,-0.9 2,-2L19,4c0,-1.1 -0.9,-2 -2,-2zM7,20L7,4h10v16L7,20zM12,9c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2c-1.11,0 -2,0.9 -2,2s0.89,2 2,2zM12,11c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"

      android:fillColor="#000000"/>

</vector>

packages/SystemUI/res/layout/media_view.xml

+17 −0
Original line number Diff line number Diff line
@@ -122,6 +122,23 @@ 
            android:textSize="14sp" />

    </LinearLayout>



    <ImageView

        android:id="@+id/media_seamless_fallback"

        android:layout_width="@dimen/qs_seamless_icon_size"

        android:layout_height="@dimen/qs_seamless_icon_size"

        android:tint="@color/media_primary_text"

        android:src="@drawable/ic_cast_connected"

        android:forceHasOverlappingRendering="false" />



    <androidx.constraintlayout.widget.Barrier

        android:id="@+id/media_seamless_barrier"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        app:barrierDirection="start"

        app:constraint_referenced_ids="media_seamless,media_seamless_fallback"

        app:barrierAllowsGoneWidgets="false"

        />



    <!-- Seek Bar -->

    <SeekBar

        android:id="@+id/media_progress_bar"

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -1269,6 +1269,9 @@ 
    <dimen name="qs_media_panel_outer_padding">16dp</dimen>

    <dimen name="qs_media_album_size">52dp</dimen>

    <dimen name="qs_seamless_icon_size">20dp</dimen>

    <dimen name="qs_seamless_fallback_icon_size">20dp</dimen>

    <dimen name="qs_seamless_fallback_top_margin">18dp</dimen>

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

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

    <dimen name="qs_footer_horizontal_margin">22dp</dimen>

packages/SystemUI/res/xml/media_collapsed.xml

+13 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
        android:layout_marginTop="20dp"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintStart_toEndOf="@id/icon"

        app:layout_constraintEnd_toStartOf="@id/media_seamless"

        app:layout_constraintEnd_toStartOf="@id/media_seamless_barrier"

        app:layout_constraintHorizontal_bias="0"

        />
@@ -51,6 +51,18 @@ 
        android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"

        />



    <Constraint

        android:id="@+id/media_seamless_fallback"

        android:layout_width="@dimen/qs_seamless_fallback_icon_size"

        android:layout_height="@dimen/qs_seamless_fallback_icon_size"

        android:layout_marginTop="@dimen/qs_seamless_fallback_top_margin"

        android:layout_marginEnd="@dimen/qs_seamless_fallback_end_margin"

        android:alpha="0.5"

        android:visibility="gone"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        />



    <Constraint

        android:id="@+id/album_art"

        android:layout_width="@dimen/qs_media_album_size"

packages/SystemUI/res/xml/media_expanded.xml

+13 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
        android:layout_marginTop="20dp"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintStart_toEndOf="@id/icon"

        app:layout_constraintEnd_toStartOf="@id/media_seamless"

        app:layout_constraintEnd_toStartOf="@id/media_seamless_barrier"

        app:layout_constraintHorizontal_bias="0"

        />
@@ -51,6 +51,18 @@ 
        android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"

        />



    <Constraint

        android:id="@+id/media_seamless_fallback"

        android:layout_width="@dimen/qs_seamless_fallback_icon_size"

        android:layout_height="@dimen/qs_seamless_fallback_icon_size"

        android:layout_marginTop="@dimen/qs_seamless_fallback_top_margin"

        android:layout_marginEnd="@dimen/qs_seamless_fallback_end_margin"

        android:alpha="0.5"

        android:visibility="gone"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        />



    <Constraint

        android:id="@+id/album_art"

        android:layout_width="@dimen/qs_media_album_size"