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

Commit 584b3fe1 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Let GrantCredentialsPermissionActivity opt out edge-to-edge" into main

parents be313074 c01eaba7

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -8351,7 +8351,7 @@ 
        <activity android:name="android.accounts.GrantCredentialsPermissionActivity"

                android:excludeFromRecents="true"

                android:exported="true"

                android:theme="@style/Theme.DeviceDefault.Light.DialogWhenLarge"

                android:theme="@style/GrantCredentialsPermissionActivity"

                android:process=":ui"

                android:visibleToInstantApps="true">

        </activity>

core/res/res/values/styles.xml

+8 −0
Original line number Diff line number Diff line
@@ -1690,4 +1690,12 @@ please see styles_device_defaults.xml. 
           parent="@style/Theme.DeviceDefault.Resolver">

        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>

    </style>



    <!--

        TODO(b/309578419): Make activities go edge-to-edge properly and then remove this.

    -->

    <style name="GrantCredentialsPermissionActivity"

           parent="@style/Theme.DeviceDefault.Light.DialogWhenLarge">

        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>

    </style>

</resources>