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

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

Merge "[Output Switcher] Update ui" into tm-dev am: d7a4daae 

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

Change-Id: I1ae90ce726ddc29b891ce1c552407d0cbf728aae
parents b26239dc d7a4daae

packages/SystemUI/res/layout/media_output_list_item.xml

+5 −6
Original line number Original line Diff line number Diff line
@@ -62,20 +62,22 @@ 
            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical|start"

            android:layout_gravity="center_vertical|start"

            android:layout_marginStart="56dp"

            android:layout_marginStart="56dp"

            android:layout_marginEnd="56dp"

            android:ellipsize="end"

            android:ellipsize="end"

            android:maxLines="1"

            android:maxLines="1"

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

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

            android:textSize="16sp"/>

            android:textSize="16sp"/>





        <RelativeLayout

        <LinearLayout

            android:id="@+id/two_line_layout"

            android:id="@+id/two_line_layout"

            android:orientation="vertical"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_gravity="center_vertical|start"

            android:layout_gravity="center_vertical|start"

            android:layout_height="48dp"

            android:layout_height="48dp"

            android:layout_marginEnd="56dp"

            android:layout_marginStart="56dp">

            android:layout_marginStart="56dp">

            <TextView

            <TextView

                android:id="@+id/two_line_title"

                android:id="@+id/two_line_title"

                android:gravity="center_vertical"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:ellipsize="end"

                android:ellipsize="end"
@@ -85,18 +87,15 @@ 
                android:textSize="16sp"/>

                android:textSize="16sp"/>

            <TextView

            <TextView

                android:id="@+id/subtitle"

                android:id="@+id/subtitle"

                android:layout_gravity="center_vertical"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="4dp"

                android:layout_alignParentBottom="true"

                android:ellipsize="end"

                android:ellipsize="end"

                android:maxLines="1"

                android:maxLines="1"

                android:textColor="@color/media_dialog_inactive_item_main_content"

                android:textColor="@color/media_dialog_inactive_item_main_content"

                android:textSize="14sp"

                android:textSize="14sp"

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

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

                android:visibility="gone"/>

                android:visibility="gone"/>

        </RelativeLayout>

        </LinearLayout>





        <ProgressBar

        <ProgressBar

            android:id="@+id/volume_indeterminate_progress"

            android:id="@+id/volume_indeterminate_progress"

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -34,7 +34,6 @@ import android.widget.FrameLayout; 
import android.widget.ImageView;

import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.LinearLayout;

import android.widget.ProgressBar;

import android.widget.ProgressBar;

import android.widget.RelativeLayout;

import android.widget.SeekBar;

import android.widget.SeekBar;

import android.widget.TextView;

import android.widget.TextView;
@@ -129,7 +128,7 @@ public abstract class MediaOutputBaseAdapter extends 
        final ImageView mTitleIcon;

        final ImageView mTitleIcon;

        final ProgressBar mProgressBar;

        final ProgressBar mProgressBar;

        final SeekBar mSeekBar;

        final SeekBar mSeekBar;

        final RelativeLayout mTwoLineLayout;

        final LinearLayout mTwoLineLayout;

        final ImageView mStatusIcon;

        final ImageView mStatusIcon;

        final CheckBox mCheckBox;

        final CheckBox mCheckBox;

        private String mDeviceId;

        private String mDeviceId;