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

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

Browse Source 
* commit '327fee84b57a902ee35f2dd7c5d2c4e65f790aac':
  MediaRouter: Prevent activity from restarting
This commit is contained in:
Jaewan Kim
2015-08-25 01:44:24 +00:00
committed by Android Git Automerger
parent 19888db227 327fee84b5
commit 586256c891
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 -->
<activity android:name=".media.SampleMediaRouterActivity"
android:configChanges="orientation|screenSize"
android:label="@string/sample_media_router_activity_dark"
android:theme="@style/Theme.AppCompat">
<intent-filter>
@@ -69,6 +70,7 @@
</activity>
<activity android:name=".media.SampleMediaRouterActivity$Light"
android:configChanges="orientation|screenSize"
android:label="@string/sample_media_router_activity_light"
android:theme="@style/Theme.AppCompat.Light">
<intent-filter>
@@ -78,6 +80,7 @@
</activity>
<activity android:name=".media.SampleMediaRouterActivity$LightWithDarkActionBar"
android:configChanges="orientation|screenSize"
android:label="@string/sample_media_router_activity_light_with_dark_action_bar"
android:theme="@style/Theme.AppCompat.Light.DarkActionBar">
<intent-filter>