summaryrefslogtreecommitdiff
path: root/packages/SystemUI/res
diff options
context:
space:
mode:
authortimhypeng <timhypeng@google.com>2020-12-08 06:30:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-08 06:30:05 +0000
commitb46ff37d8af90ad917defbe23b62b240ce135804 (patch)
tree4c42aa697555a0cf062efb2570a1da65ba83e1aa /packages/SystemUI/res
parentc7d19b9d24a8c2c82fca117e932889105f9e4d70 (diff)
parent5fc4c2883df8bec75d14a3e2d6491ffa96783496 (diff)
Add "Stop" button for remote device am: 5fc4c2883d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13109608 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I139a01e203546ec1bfcbc6077445a24779ae4fb1
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r--packages/SystemUI/res/layout/media_output_dialog.xml24
-rw-r--r--packages/SystemUI/res/values/dimens.xml3
2 files changed, 3 insertions, 24 deletions
diff --git a/packages/SystemUI/res/layout/media_output_dialog.xml b/packages/SystemUI/res/layout/media_output_dialog.xml
index 0229e6e9d4dd..73beefc9da83 100644
--- a/packages/SystemUI/res/layout/media_output_dialog.xml
+++ b/packages/SystemUI/res/layout/media_output_dialog.xml
@@ -32,7 +32,7 @@
android:id="@+id/header_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingEnd="16dp"/>
+ android:paddingEnd="@dimen/media_output_dialog_header_icon_padding"/>
<LinearLayout
android:layout_width="match_parent"
@@ -70,36 +70,14 @@
android:id="@+id/device_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="start|center_vertical"
android:orientation="vertical">
- <View
- android:layout_width="match_parent"
- android:layout_height="12dp"/>
-
- <include
- layout="@layout/media_output_list_item"
- android:id="@+id/group_item_controller"
- android:visibility="gone"/>
-
- <View
- android:id="@+id/group_item_divider"
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="?android:attr/listDivider"
- android:visibility="gone"/>
-
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list_result"
android:scrollbars="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never"/>
-
- <View
- android:id="@+id/list_bottom_padding"
- android:layout_width="match_parent"
- android:layout_height="12dp"/>
</LinearLayout>
<View
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 4cd8d19b8121..a4f87f041e57 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -1404,9 +1404,10 @@
<dimen name="config_rounded_mask_size_bottom">@*android:dimen/rounded_corner_radius_bottom</dimen>
<!-- Output switcher panel related dimensions -->
- <dimen name="media_output_dialog_padding_top">11dp</dimen>
+ <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_icon_padding">16dp</dimen>
<dimen name="media_output_dialog_icon_corner_radius">16dp</dimen>
</resources>