Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b2c3db8 authored by shannonchen's avatar shannonchen Committed by Shannon Chen
Browse files

Make GameSessionTrampolineActivity invisible 

This change adds a new theme to prevent
GameSessionTrampolineActivity from displaying
any UI, which in turn delegates the
decision of whether or not to show things
like the system bars to the delegate
activity. This change also disables
transition animations for the trampoline
activity, to prevent them from causing
flickering.

Bug: 229757156
Test: manual testing using GMS dashboard
Change-Id: I82e0ede2e9f0b334fd01e958eab0736042119e84
parent 444880f0

core/java/android/service/games/GameSessionTrampolineActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -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);

    }

}

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

core/res/res/values/themes.xml

+16 −0
Original line number Diff line number Diff line
@@ -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>