diff options
| -rw-r--r-- | core/java/android/service/games/GameSessionTrampolineActivity.java | 2 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/themes.xml | 16 |
3 files changed, 19 insertions, 1 deletions
diff --git a/core/java/android/service/games/GameSessionTrampolineActivity.java b/core/java/android/service/games/GameSessionTrampolineActivity.java index 3d97d0f59b33..eec7ac6ff447 100644 --- a/core/java/android/service/games/GameSessionTrampolineActivity.java +++ b/core/java/android/service/games/GameSessionTrampolineActivity.java @@ -60,6 +60,7 @@ public final class GameSessionTrampolineActivity extends Activity { FUTURE_KEY); future.completeExceptionally(e); finish(); + overridePendingTransition(0, 0); } } @@ -74,5 +75,6 @@ public final class GameSessionTrampolineActivity extends Activity { FUTURE_KEY); future.complete(new GameSessionActivityResult(resultCode, data)); finish(); + overridePendingTransition(0, 0); } } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 4075c5f4d8ae..0a2b01998ca9 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -6790,7 +6790,7 @@ android:excludeFromRecents="true" android:exported="true" android:permission="android.permission.MANAGE_GAME_ACTIVITY" - android:theme="@style/Theme.Translucent.NoTitleBar"> + android:theme="@style/Theme.GameSessionTrampoline"> </activity> <receiver android:name="com.android.server.BootReceiver" diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index bf42da080390..a60862b74e15 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -894,6 +894,22 @@ please see themes_device_defaults.xml. <!-- @hide Special theme for the default system Activity-based Alert dialogs. --> <style name="Theme.Dialog.Confirmation" parent="Theme.DeviceDefault.Dialog.Alert.DayNight" /> + <!-- @hide Theme for GameSessionTrampolineActivity that prevents showing UI and activity + transitions. --> + <style name="Theme.GameSessionTrampoline"> + <item name="backgroundDimEnabled">false</item> + <item name="colorBackgroundCacheHint">@null</item> + <item name="navigationBarColor">@color/transparent</item> + <item name="statusBarColor">@color/transparent</item> + <item name="windowAnimationStyle">@null</item> + <item name="windowBackground">@null</item> + <item name="windowContentOverlay">@null</item> + <item name="windowDrawsSystemBarBackgrounds">true</item> + <item name="windowIsFloating">true</item> + <item name="windowIsTranslucent">true</item> + <item name="windowNoTitle">true</item> + </style> + <!-- Theme for a window that looks like a toast. --> <style name="Theme.Toast" parent="Theme.DeviceDefault.Dialog"> <item name="windowBackground">?attr/toastFrameBackground</item> |