diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:13:45 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:13:45 -0800 |
| commit | 0a521f6d93206567c14bbacdc13819bf4baf82d3 (patch) | |
| tree | 2e11b47c9856368387b394b6831726f2526bf6dd /samples/Support7Demos/res/layout/sample_media_router.xml | |
| parent | 171957c0bdc547ae6013daddffc03c8ec3ac2e3e (diff) | |
| parent | adce814038b96c87ea66fc1e5bfd85ab28d80590 (diff) | |
| download | android_development-0a521f6d93206567c14bbacdc13819bf4baf82d3.tar.gz android_development-0a521f6d93206567c14bbacdc13819bf4baf82d3.tar.bz2 android_development-0a521f6d93206567c14bbacdc13819bf4baf82d3.zip | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/development into cm-13.0staging/cm-13.0+r22stable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2K
Android 6.0.1 release 22
Diffstat (limited to 'samples/Support7Demos/res/layout/sample_media_router.xml')
| -rw-r--r-- | samples/Support7Demos/res/layout/sample_media_router.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/samples/Support7Demos/res/layout/sample_media_router.xml b/samples/Support7Demos/res/layout/sample_media_router.xml index e2f7008df..618a8e40f 100644 --- a/samples/Support7Demos/res/layout/sample_media_router.xml +++ b/samples/Support7Demos/res/layout/sample_media_router.xml @@ -76,6 +76,12 @@ </TabHost> <!-- Control buttons for the currently selected route. --> + <CheckBox android:id="@+id/custom_control_view_checkbox" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/use_default_media_control" + android:checked="true" + android:visibility="gone"/> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" |