diff options
| author | sigmabeta <sigmabeta@users.noreply.github.com> | 2015-06-26 15:01:23 -0400 |
|---|---|---|
| committer | sigmabeta <sigmabeta@users.noreply.github.com> | 2015-06-26 15:01:23 -0400 |
| commit | fd82f90fcea42c11435ce88a61cfe5dfd0d03f1a (patch) | |
| tree | c116d84984f773a6b0fd3e444baa1fde079e0d04 /Source/Android/app/src/main/res | |
| parent | 0fcf0e1d213892dd316bb57e5932c2e77fba691b (diff) | |
Android: Show transition animation when exiting game.
Diffstat (limited to 'Source/Android/app/src/main/res')
| -rw-r--r-- | Source/Android/app/src/main/res/layout/activity_emulation.xml | 3 | ||||
| -rw-r--r-- | Source/Android/app/src/main/res/values/styles.xml | 33 |
2 files changed, 12 insertions, 24 deletions
diff --git a/Source/Android/app/src/main/res/layout/activity_emulation.xml b/Source/Android/app/src/main/res/layout/activity_emulation.xml index c686c6191e..9e4e84e151 100644 --- a/Source/Android/app/src/main/res/layout/activity_emulation.xml +++ b/Source/Android/app/src/main/res/layout/activity_emulation.xml @@ -1,10 +1,11 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" + android:id="@+id/frame_content" > <FrameLayout - android:id="@+id/frame_content" + android:id="@+id/frame_emulation_fragment" android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible"/> diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml index dc81c173a7..dcfe4a77b7 100644 --- a/Source/Android/app/src/main/res/values/styles.xml +++ b/Source/Android/app/src/main/res/values/styles.xml @@ -8,17 +8,10 @@ <!-- darker variant for the status bar and contextual app bars --> <item name="colorPrimaryDark">@color/dolphin_blue_dark</item> - <!--enable window content transitions - <item name="android:windowContentTransitions">true</item> - - <!– specify enter and exit transitions –> - <item name="android:windowEnterTransition">@android:transition/fade</item> - <item name="android:windowExitTransition">@android:transition/fade</item> - - <!– specify shared element transitions –> - <item name="android:windowSharedElementEnterTransition">@transition/change_image_transform</item> - <item name="android:windowSharedElementExitTransition">@transition/change_image_transform</item> ---> + <!--enable window content transitions--> + <item name="android:windowContentTransitions">true</item> + <item name="android:windowAllowEnterTransitionOverlap">true</item> + <item name="android:windowAllowReturnTransitionOverlap">true</item> </style> <!-- Same as above, but use default action bar, and mandate margins. --> @@ -74,23 +67,17 @@ <item name="colorAccent">@color/dolphin_accent_wiiware</item> </style> - <style name="DolphinEmulationBase" parent="Theme.AppCompat.Light.DarkActionBar"> + <style name="DolphinEmulationBase" parent="Theme.AppCompat"> <item name="colorPrimary">@color/dolphin_blue</item> <item name="colorPrimaryDark">@color/dolphin_blue_dark</item> <item name="android:windowTranslucentNavigation">true</item> - <!-- enable window content transitions --> - <item name="android:windowContentTransitions">true</item> - - <!-- specify enter and exit transitions --> - <item name="android:windowEnterTransition">@android:transition/explode</item> - <item name="android:windowExitTransition">@android:transition/explode</item> + <item name="android:windowBackground">@android:color/black</item> - <!-- specify shared element transitions --> - <item name="android:windowSharedElementEnterTransition">@transition/change_image_transform - </item> - <item name="android:windowSharedElementExitTransition">@transition/change_image_transform - </item> + <!--enable window content transitions--> + <item name="android:windowContentTransitions">true</item> + <item name="android:windowAllowEnterTransitionOverlap">true</item> + <item name="android:windowAllowReturnTransitionOverlap">true</item> </style> <!-- Inherit from the Base Dolphin Emulation Theme--> |