Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make MediaRouteControllerDialog scrollable" into mnc-dev

Browse Source
This commit is contained in:
Sungsoo Lim
2015-06-11 23:52:01 +00:00
committed by Android (Google) Code Review
parent 4669f4d674 fda6696bd9
commit d7118bcc31
1 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
core/res/res/layout/media_route_controller_dialog.xml
View File

@@ -14,47 +14,50 @@
limitations under the License. limitations under the License.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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="match_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/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="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" />
<!-- Disconnect button. -->
<LinearLayout android:layout_width="match_parent" <LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/buttonBarStyle"> android:orientation="vertical"
<Button android:id="@+id/media_route_disconnect_button" android:divider="?android:attr/dividerHorizontal"
android:layout_width="match_parent" android:showDividers="middle">
android:layout_height="match_parent" <!-- Optional volume slider section. -->
style="?attr/buttonBarButtonStyle" <LinearLayout android:id="@+id/media_route_volume_layout"
android:gravity="center" android:layout_width="match_parent"
android:text="@string/media_route_controller_disconnect" /> 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/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="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" />
<!-- Disconnect button. -->
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?attr/buttonBarStyle">
<Button android:id="@+id/media_route_disconnect_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
style="?attr/buttonBarButtonStyle"
android:gravity="center"
android:text="@string/media_route_controller_disconnect" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </ScrollView>