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

Merge "Make GameSessionTrampolineActivity invisible" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-28 04:32:39 +00:00
committed by Android (Google) Code Review
parent 5793f436ad 7b2c3db83a
commit a74842fe07
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_KEY);
future.completeExceptionally(e); future.completeExceptionally(e);
finish(); finish();
overridePendingTransition(0, 0);
} }
} }
@@ -125,5 +126,6 @@ public final class GameSessionTrampolineActivity extends Activity {
FUTURE_KEY); FUTURE_KEY);
future.complete(new GameSessionActivityResult(resultCode, data)); future.complete(new GameSessionActivityResult(resultCode, data));
finish(); finish();
overridePendingTransition(0, 0);
} }
} }

2
core/res/AndroidManifest.xml
View File

@@ -6792,7 +6792,7 @@
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:permission="android.permission.MANAGE_GAME_ACTIVITY" android:permission="android.permission.MANAGE_GAME_ACTIVITY"
android:theme="@style/Theme.Translucent.NoTitleBar"> android:theme="@style/Theme.GameSessionTrampoline">
</activity> </activity>
<receiver android:name="com.android.server.BootReceiver" <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. --> <!-- @hide Special theme for the default system Activity-based Alert dialogs. -->
<style name="Theme.Dialog.Confirmation" parent="Theme.DeviceDefault.Dialog.Alert.DayNight" /> <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. --> <!-- Theme for a window that looks like a toast. -->
<style name="Theme.Toast" parent="Theme.DeviceDefault.Dialog"> <style name="Theme.Toast" parent="Theme.DeviceDefault.Dialog">
<item name="windowBackground">?attr/toastFrameBackground</item> <item name="windowBackground">?attr/toastFrameBackground</item>