LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "MediaRouter: Prevent activity from restarting" into mnc-ub-dev

Browse Source
This commit is contained in:
Jaewan Kim
2015-08-25 01:40:35 +00:00
committed by Android (Google) Code Review
parent e6b72719a8 5d04bdb493
commit 327fee84b5
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/Support7Demos/AndroidManifest.xml
View File

@@ -60,6 +60,7 @@
<!-- MediaRouter Support Samples --> <!-- MediaRouter Support Samples -->
<activity android:name=".media.SampleMediaRouterActivity" <activity android:name=".media.SampleMediaRouterActivity"
android:configChanges="orientation|screenSize"
android:label="@string/sample_media_router_activity_dark" android:label="@string/sample_media_router_activity_dark"
android:theme="@style/Theme.AppCompat"> android:theme="@style/Theme.AppCompat">
<intent-filter> <intent-filter>
@@ -69,6 +70,7 @@
</activity> </activity>
<activity android:name=".media.SampleMediaRouterActivity$Light" <activity android:name=".media.SampleMediaRouterActivity$Light"
android:configChanges="orientation|screenSize"
android:label="@string/sample_media_router_activity_light" android:label="@string/sample_media_router_activity_light"
android:theme="@style/Theme.AppCompat.Light"> android:theme="@style/Theme.AppCompat.Light">
<intent-filter> <intent-filter>
@@ -78,6 +80,7 @@
</activity> </activity>
<activity android:name=".media.SampleMediaRouterActivity$LightWithDarkActionBar" <activity android:name=".media.SampleMediaRouterActivity$LightWithDarkActionBar"
android:configChanges="orientation|screenSize"
android:label="@string/sample_media_router_activity_light_with_dark_action_bar" android:label="@string/sample_media_router_activity_light_with_dark_action_bar"
android:theme="@style/Theme.AppCompat.Light.DarkActionBar"> android:theme="@style/Theme.AppCompat.Light.DarkActionBar">
<intent-filter> <intent-filter>