diff options
| author | Jaewan Kim <jaewan@google.com> | 2015-08-25 01:40:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-25 01:40:35 +0000 |
| commit | 327fee84b57a902ee35f2dd7c5d2c4e65f790aac (patch) | |
| tree | f6a6b38a9fdf8b95d31104439c791c05ce25e2e4 | |
| parent | e6b72719a85a4731673d1d56f7b4f7463f18e249 (diff) | |
| parent | 5d04bdb49366abd279480fdacc3f612d03578b35 (diff) | |
| download | android_development-327fee84b57a902ee35f2dd7c5d2c4e65f790aac.tar.gz android_development-327fee84b57a902ee35f2dd7c5d2c4e65f790aac.tar.bz2 android_development-327fee84b57a902ee35f2dd7c5d2c4e65f790aac.zip | |
Merge "MediaRouter: Prevent activity from restarting" into mnc-ub-dev
| -rw-r--r-- | samples/Support7Demos/AndroidManifest.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/samples/Support7Demos/AndroidManifest.xml b/samples/Support7Demos/AndroidManifest.xml index 288b124e8..164411ac2 100644 --- a/samples/Support7Demos/AndroidManifest.xml +++ b/samples/Support7Demos/AndroidManifest.xml @@ -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> |