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

Commit c8a67e21 authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "[Output Switcher] Update Ui layout to match with mertial next" into sc-v2-dev am: 152da31e 

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

Change-Id: Icdac8821b1a8c834078c25e02f358f3f435806ba
parents 5a262c65 152da31e

packages/SystemUI/res/drawable/media_output_dialog_button_background.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<!--

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

    <stroke

        android:color="?androidprv:attr/colorAccentPrimaryVariant"

        android:width="1dp"/>

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

    <padding

        android:left="16dp"

        android:right="16dp"

        android:top="8dp"

        android:bottom="8dp" />

    <solid android:color="@android:color/transparent" />

</shape>

packages/SystemUI/res/layout/media_output_dialog.xml

+22 −19
Original line number Diff line number Diff line
@@ -24,41 +24,44 @@ 


    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="94dp"

        android:layout_height="96dp"

        android:gravity="start|center_vertical"

        android:paddingStart="16dp"

        android:orientation="horizontal">

        <ImageView

            android:id="@+id/header_icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingEnd="@dimen/media_output_dialog_header_icon_padding"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:importantForAccessibility="no"/>



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginEnd="16dp"

            android:layout_height="match_parent"

            android:paddingStart="16dp"

            android:paddingTop="20dp"

            android:paddingBottom="24dp"

            android:paddingEnd="24dp"

            android:orientation="vertical">

            <TextView

                android:id="@+id/header_title"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:ellipsize="end"

                android:gravity="center_vertical"

                android:maxLines="1"

                android:textColor="?android:attr/textColorPrimary"

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

                android:textSize="20sp"/>



            <TextView

                android:id="@+id/header_subtitle"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:gravity="center_vertical"

                android:ellipsize="end"

                android:maxLines="1"

                android:textColor="?android:attr/textColorTertiary"

                android:fontFamily="roboto-regular"

                android:textSize="14sp"/>



                android:textSize="16sp"/>

        </LinearLayout>

    </LinearLayout>
@@ -81,21 +84,21 @@ 
            android:overScrollMode="never"/>

    </LinearLayout>



    <View

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:background="?android:attr/listDivider"/>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="16dp"

        android:layout_marginStart="24dp"

        android:layout_marginBottom="18dp"

        android:layout_marginEnd="24dp"

        android:orientation="horizontal">



        <Button

            android:id="@+id/stop"

            style="@*android:style/Widget.DeviceDefault.Button.Borderless.Colored"

            style="@style/MediaOutputRoundedOutlinedButton"

            android:layout_width="wrap_content"

            android:layout_height="64dp"

            android:layout_height="36dp"

            android:minWidth="0dp"

            android:text="@string/keyboard_key_media_stop"

            android:visibility="gone"/>
@@ -106,10 +109,10 @@ 


        <Button

            android:id="@+id/done"

            style="@*android:style/Widget.DeviceDefault.Button.Borderless.Colored"

            style="@style/MediaOutputRoundedOutlinedButton"

            android:layout_width="wrap_content"

            android:layout_height="64dp"

            android:layout_marginEnd="0dp"

            android:layout_height="36dp"

            android:minWidth="0dp"

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

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/media_output_list_item.xml

+41 −48
Original line number Diff line number Diff line
@@ -23,17 +23,20 @@ 
    android:orientation="vertical">

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="64dp">

        android:layout_height="88dp"

        android:paddingTop="24dp"

        android:paddingBottom="16dp"

        android:paddingStart="24dp"

        android:paddingEnd="8dp">



        <FrameLayout

            android:layout_width="36dp"

            android:layout_height="36dp"

            android:layout_gravity="center_vertical|start"

            android:layout_marginStart="16dp">

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:layout_gravity="center_vertical|start">

            <ImageView

                android:id="@+id/title_icon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:layout_gravity="center"/>

        </FrameLayout>
@@ -42,88 +45,80 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical|start"

            android:layout_marginStart="68dp"

            android:layout_marginStart="64dp"

            android:ellipsize="end"

            android:maxLines="1"

            android:textColor="?android:attr/textColorPrimary"

            android:textSize="14sp"/>

            android:textSize="16sp"/>



        <RelativeLayout

            android:id="@+id/two_line_layout"

            android:layout_width="wrap_content"

            android:layout_height="48dp"

            android:layout_marginStart="52dp"

            android:layout_marginEnd="69dp"

            android:layout_marginTop="10dp">

            android:layout_marginStart="48dp">

            <TextView

                android:id="@+id/two_line_title"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="16dp"

                android:layout_marginEnd="15dp"

                android:layout_marginEnd="48dp"

                android:ellipsize="end"

                android:maxLines="1"

                android:textColor="?android:attr/textColorPrimary"

                android:textSize="14sp"/>

                android:textSize="16sp"/>

            <TextView

                android:id="@+id/subtitle"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="16dp"

                android:layout_marginEnd="15dp"

                android:layout_marginBottom="7dp"

                android:layout_marginTop="4dp"

                android:layout_alignParentBottom="true"

                android:ellipsize="end"

                android:maxLines="1"

                android:textColor="?android:attr/textColorSecondary"

                android:textSize="12sp"

                android:textSize="14sp"

                android:fontFamily="roboto-regular"

                android:visibility="gone"/>

            <SeekBar

                android:id="@+id/volume_seekbar"

                android:layout_marginTop="16dp"

                android:layout_marginEnd="8dp"

                style="@*android:style/Widget.DeviceDefault.SeekBar"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_alignParentBottom="true"/>

        </RelativeLayout>



        <ProgressBar

            android:id="@+id/volume_indeterminate_progress"

            style="@*android:style/Widget.Material.ProgressBar.Horizontal"

            android:layout_width="258dp"

            android:layout_height="18dp"

            android:layout_marginStart="68dp"

            android:layout_marginTop="40dp"

            android:indeterminate="true"

            android:indeterminateOnly="true"

            android:visibility="gone"/>



        <View

            android:id="@+id/end_divider"

            android:layout_width="1dp"

            android:layout_height="36dp"

            android:layout_marginEnd="68dp"

            android:layout_gravity="right|center_vertical"

            android:background="?android:attr/listDivider"

            android:visibility="gone"/>



            <ImageView

                android:id="@+id/add_icon"

                android:layout_width="24dp"

                android:layout_height="24dp"

            android:layout_gravity="right|center_vertical"

                android:layout_gravity="right"

                android:layout_marginEnd="24dp"

                android:layout_alignParentRight="true"

                android:src="@drawable/ic_add"

                android:tint="?android:attr/colorAccent"

            android:visibility="gone"/>



            />

            <CheckBox

                android:id="@+id/check_box"

                android:layout_width="24dp"

                android:layout_height="24dp"

            android:layout_gravity="right|center_vertical"

                android:layout_gravity="right"

                android:layout_marginEnd="24dp"

                android:layout_alignParentRight="true"

                android:button="@drawable/ic_check_box"

                android:visibility="gone"

                />

        </RelativeLayout>



        <ProgressBar

            android:id="@+id/volume_indeterminate_progress"

            style="@*android:style/Widget.Material.ProgressBar.Horizontal"

            android:layout_width="258dp"

            android:layout_height="18dp"

            android:layout_marginStart="64dp"

            android:layout_marginTop="28dp"

            android:indeterminate="true"

            android:indeterminateOnly="true"

            android:visibility="gone"/>

    </FrameLayout>
@@ -131,8 +126,6 @@ 
        android:id="@+id/bottom_divider"

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:layout_marginTop="12dp"

        android:layout_marginBottom="12dp"

        android:layout_gravity="bottom"

        android:background="?android:attr/listDivider"

        android:visibility="gone"/>

packages/SystemUI/res/values/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -1439,10 +1439,10 @@ 
    <!-- Output switcher panel related dimensions -->

    <dimen name="media_output_dialog_list_margin">12dp</dimen>

    <dimen name="media_output_dialog_list_max_height">364dp</dimen>

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

    <dimen name="media_output_dialog_header_back_icon_size">36dp</dimen>

    <dimen name="media_output_dialog_header_album_icon_size">48dp</dimen>

    <dimen name="media_output_dialog_header_back_icon_size">32dp</dimen>

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

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

    <dimen name="media_output_dialog_icon_corner_radius">8dp</dimen>

    <dimen name="media_output_dialog_title_anim_y_delta">12.5dp</dimen>



    <!-- Distance that the full shade transition takes in order for qs to fully transition to the

packages/SystemUI/res/values/styles.xml

+4 −0
Original line number Diff line number Diff line
@@ -513,6 +513,10 @@ 
        <item name="android:background">@drawable/btn_borderless_rect</item>

    </style>



    <style name="MediaOutputRoundedOutlinedButton" parent="@android:style/Widget.Material.Button">

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

    </style>



    <style name="TunerSettings" parent="@android:style/Theme.DeviceDefault.Settings">

        <item name="android:windowActionBar">false</item>

        <item name="preferenceTheme">@style/TunerPreferenceTheme</item>