Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make GameSessionTrampolineActivity invisible" into tm-dev am: a74842fe07

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17831912

Change-Id: I52e0fef4f926695a10f71df928d7e10608d4e05a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-28 05:19:16 +00:00
committed by Automerger Merge Worker
parent f52d2409ae a74842fe07
commit f12a6b47a8
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/service/games/GameSessionTrampolineActivity.java
View File

@@ -105,6 +105,7 @@ public final class GameSessionTrampolineActivity extends Activity {
FUTURE_KEY);
future.completeExceptionally(e);
finish();
overridePendingTransition(0, 0);
}
}
@@ -125,5 +126,6 @@ public final class GameSessionTrampolineActivity extends Activity {
FUTURE_KEY);
future.complete(new GameSessionActivityResult(resultCode, data));
finish();
overridePendingTransition(0, 0);
}
}

2
core/res/AndroidManifest.xml
View File

@@ -6792,7 +6792,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"

16
core/res/res/values/themes.xml
View File

@@ -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>