diff options
| author | Adam Powell <adamp@google.com> | 2013-07-17 17:10:07 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2013-07-18 11:24:56 -0700 |
| commit | 5bf150759e2701ebff560bbd28e701476beb01aa (patch) | |
| tree | d1e98041bb56e162460c75164a0bb668010e9848 | |
| parent | 58516d86b38616ca5f0e92c868f414dfafc18866 (diff) | |
| download | support-jb-mr2.0-release.tar.gz | |
MediaRouter dialog layout improvementsandroid-4.3_r2.3android-4.3_r2.2android-4.3_r2.1jb-mr2.0-release
Make the MediaRouter dialog layout match old platform standards.
Bug 9863000
Change-Id: Idabc17beccc1e91fa4c02fdcbeeedb537ea974a9
(cherry picked from commit 4ba232325a4ec8f4e0681a290d2fe6ad22065437)
| -rw-r--r-- | v7/mediarouter/res/layout-v11/mr_media_route_controller_dialog.xml | 60 | ||||
| -rw-r--r-- | v7/mediarouter/res/layout/mr_media_route_controller_dialog.xml | 15 |
2 files changed, 71 insertions, 4 deletions
diff --git a/v7/mediarouter/res/layout-v11/mr_media_route_controller_dialog.xml b/v7/mediarouter/res/layout-v11/mr_media_route_controller_dialog.xml new file mode 100644 index 00000000000..b45fd15f627 --- /dev/null +++ b/v7/mediarouter/res/layout-v11/mr_media_route_controller_dialog.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:divider="?android:attr/dividerHorizontal" + android:showDividers="middle"> + <!-- Optional volume slider section. --> + <LinearLayout android:id="@+id/media_route_volume_layout" + android:layout_width="fill_parent" + android:layout_height="64dp" + android:gravity="center_vertical" + android:padding="8dp" + android:visibility="gone"> + <ImageView android:layout_width="48dp" + android:layout_height="48dp" + android:src="@drawable/mr_ic_audio_vol" + android:gravity="center" + android:scaleType="center" /> + <SeekBar android:id="@+id/media_route_volume_slider" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" /> + </LinearLayout> + + <!-- Optional content view section. --> + <FrameLayout android:id="@+id/media_route_control_frame" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:visibility="gone" /> + + <!-- Disconnect button. --> + <LinearLayout android:layout_width="fill_parent" + android:layout_height="wrap_content" + style="?attr/buttonBarStyle"> + <Button android:id="@+id/media_route_disconnect_button" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + style="?attr/buttonBarButtonStyle" + android:gravity="center" + android:text="@string/mr_media_route_controller_disconnect" /> + </LinearLayout> +</LinearLayout> diff --git a/v7/mediarouter/res/layout/mr_media_route_controller_dialog.xml b/v7/mediarouter/res/layout/mr_media_route_controller_dialog.xml index 549ceab31ac..a1b24bd0cfb 100644 --- a/v7/mediarouter/res/layout/mr_media_route_controller_dialog.xml +++ b/v7/mediarouter/res/layout/mr_media_route_controller_dialog.xml @@ -49,12 +49,19 @@ <!-- Disconnect button. --> <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - style="?android:attr/buttonBarStyle"> + style="?attr/buttonBarStyle"> + <View android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="0.25" /> <Button android:id="@+id/media_route_disconnect_button" - android:layout_width="fill_parent" - android:layout_height="56dp" - style="?android:attr/buttonBarButtonStyle" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="fill_parent" + style="?attr/buttonBarButtonStyle" android:gravity="center" android:text="@string/mr_media_route_controller_disconnect" /> + <View android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="0.25" /> </LinearLayout> </LinearLayout> |