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

Commit 0c5d3ddf authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Show warning when touches are being blocked by overlays" into mnc-dev

parents 51fc8c6e 5c07dcb0

AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".permission.ui.OverlayWarningDialog"

                android:excludeFromRecents="true"

                android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar" />



        <receiver android:name=".permission.model.PermissionStatusReceiver"

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

            <intent-filter>

res/layout/grant_permissions.xml

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
        android:paddingBottom="8dip"

        android:paddingStart="22dip"

        android:paddingEnd="16dip"

        android:filterTouchesWhenObscured="true"

        android:orientation="vertical">



        <FrameLayout

res/layout/header.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
        android:layout_marginStart="@dimen/header_subsettings_margin_start"

        android:layout_alignWithParentIfMissing="true"

        android:layout_centerVertical="true"

        android:textAppearance="@android:style/TextAppearance.Material.Medium"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textColor="@android:color/white"

        android:textAlignment="viewStart" />

res/layout/permissions_frame.xml

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ 
    <FrameLayout

        android:id="@+id/prefs_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:filterTouchesWhenObscured="true">

        android:layout_height="match_parent">



        <TextView

            android:id="@+id/no_permissions"

res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
        <item name="android:backgroundDimEnabled">true</item>

    </style>



    <style name="Theme.Header.Settings" parent="@android:style/Theme.Material.Settings">

    <style name="Theme.Header.Settings" parent="@android:style/Theme.DeviceDefault.Settings">

    </style>



    <style name="PreferenceThemeOverlay.v14.Permissions">