diff options
Diffstat (limited to 'samples/browseable/BasicMediaRouter')
4 files changed, 33 insertions, 20 deletions
diff --git a/samples/browseable/BasicMediaRouter/AndroidManifest.xml b/samples/browseable/BasicMediaRouter/AndroidManifest.xml index 33c20d582..f84b7dfea 100644 --- a/samples/browseable/BasicMediaRouter/AndroidManifest.xml +++ b/samples/browseable/BasicMediaRouter/AndroidManifest.xml @@ -20,9 +20,7 @@ android:versionCode="1" android:versionName="1.0" > - <uses-sdk - android:minSdkVersion="17" - android:targetSdkVersion="17" /> + <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle --> <application android:allowBackup="true" diff --git a/samples/browseable/BasicMediaRouter/_index.jd b/samples/browseable/BasicMediaRouter/_index.jd index 54081ede7..9d2f3f5b9 100644 --- a/samples/browseable/BasicMediaRouter/_index.jd +++ b/samples/browseable/BasicMediaRouter/_index.jd @@ -1,18 +1,14 @@ - - - page.tags="BasicMediaRouter" sample.group=Media @jd:body -<p>This sample demonstrates how to use the {@link android.media.MediaRouter} -API to display content on a secondary display.</p> -<p>To see this in action, run the sample and use the -<strong>Media Route Action Item</strong> in the action bar to select an -output device. If your device supports Miracast wireless displays, you may -need to enable <strong>Wireless Display</strong> functionality in the -system settings.</p> -<p>You can also enable secondary screen simulation from the -<em>Developer options</em> in the system Settings. Once -connected, use the <strong>Change Color</strong> button to change the -background color of the secondary screen.</p> +<p> + + This sample demonstrates the use of the MediaRouter API to display + content on a secondary display.\n\nUse the "Media Route Action Item" in the ActionBar + to select an output device. If your device supports Miracast wireless displays, + you may need to enable "Wireless Display" functionality in the system settings. + Secondary screen simulation can also be enabled from the "Developer Options".\n\n +Once connected, use the "Change Color" button to change the background color of the secondary screen. + + </p> diff --git a/samples/browseable/BasicMediaRouter/res/values-v21/template-styles.xml b/samples/browseable/BasicMediaRouter/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/BasicMediaRouter/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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. + --> + +<resources> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/BasicMediaRouter/res/values/base-strings.xml b/samples/browseable/BasicMediaRouter/res/values/base-strings.xml index 211577118..6f16407f3 100644 --- a/samples/browseable/BasicMediaRouter/res/values/base-strings.xml +++ b/samples/browseable/BasicMediaRouter/res/values/base-strings.xml @@ -14,9 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - <resources> <string name="app_name">BasicMediaRouter</string> <string name="intro_message"> |