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

Commit 28ac5cd6 authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE am: 36409f23 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PackageInstaller/+/12888376

Change-Id: I0a9bfddf966fb76a3134b91a6ae59b4cbb9af448
parents d8b1a352 36409f23

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ 
        <activity android:name=".permission.ui.GrantPermissionsActivity"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:excludeFromRecents="true"

                android:theme="@style/GrantPermissions"

                android:theme="@style/GrantPermissions.FilterTouches"

                android:visibleToInstantApps="true">

            <intent-filter android:priority="1">

                <action android:name="android.content.pm.action.REQUEST_PERMISSIONS" />
@@ -138,7 +138,7 @@ 
                  android:configChanges="orientation|keyboardHidden|screenSize"

                  android:excludeFromRecents="true"

                  android:label="@string/app_permissions"

                  android:theme="@style/Settings"

                  android:theme="@style/Settings.FilterTouches"

                  android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS">

            <intent-filter android:priority="1">

                <action android:name="android.intent.action.MANAGE_PERMISSIONS" />

res/values/themes.xml

+17 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
        <item name="android:textAppearanceMedium">@style/MediumText</item>

        <item name="android:textAppearanceSmall">@style/SmallText</item>

        <item name="android:titleTextStyle">@style/TitleText</item>

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

    </style>



    <style name="DialogWhenLargeNoAnimation" parent="DialogWhenLarge">
@@ -54,4 +55,20 @@ 
    </style>









<!-- Do not allow OEMs to overlay these themes.

 Must Guarantee that filterTouches is set for these activities -->

    <style name="FilterTouches">

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

    </style>



    <style name="Settings.FilterTouches">

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

    </style>



    <style name="GrantPermissions.FilterTouches">

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

    </style>



</resources>