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

Commit b7a9aff9 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Make GameSessionTrampolineActivity invisible" into tm-dev am: a74842fe am: 676ed3c3"
parents 32c2f33f 56facacf

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

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

    }

}

core/res/AndroidManifest.xml

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