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

Commit 94872a3f authored by Phil Weaver's avatar Phil Weaver Committed by Tim Schumacher
Browse files

Back-port ag/2491664 

Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
(cherry picked from commit e76e0535)
parent 6307a27f

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
    <uses-permission android:name="android.permission.READ_PHONE_BLACKLIST" />

    <uses-permission android:name="android.permission.CHANGE_PHONE_BLACKLIST" />

    <uses-permission android:name="com.cyanogen.permission.REQUEST_KILL_SWITCH_OP" />

    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />



    <permission

        android:name="android.permission.REQUEST_SUPERUSER"

src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java

+10 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import android.provider.Settings; 
import android.text.TextUtils;

import android.view.LayoutInflater;

import android.view.View;

import android.view.Window;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityManager;

import android.widget.ImageView;

import android.widget.LinearLayout;
@@ -44,6 +46,8 @@ import java.util.HashSet; 
import java.util.List;

import java.util.Set;



import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



public class ToggleAccessibilityServicePreferenceFragment

        extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener {
@@ -159,7 +163,7 @@ public class ToggleAccessibilityServicePreferenceFragment 
            if (info == null) {

                return null;

            }

            return new AlertDialog.Builder(getActivity())

            final AlertDialog ad = new AlertDialog.Builder(getActivity())

            .setTitle(getString(R.string.enable_service_title,

                    info.getResolveInfo().loadLabel(getPackageManager())))

                    .setIconAttribute(android.R.attr.alertDialogIcon)
@@ -168,6 +172,11 @@ public class ToggleAccessibilityServicePreferenceFragment 
                    .setPositiveButton(android.R.string.ok, this)

                    .setNegativeButton(android.R.string.cancel, this)

                    .create();

            Window window = ad.getWindow();

            WindowManager.LayoutParams params = window.getAttributes();

            params.privateFlags |= PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;

            window.setAttributes(params);

            return ad;

        }

            case DIALOG_ID_DISABLE_WARNING: {

            mShownDialogId = DIALOG_ID_DISABLE_WARNING;