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

Commit bebc9f9f authored by Phil Weaver's avatar Phil Weaver Committed by android-build-merger
Browse files

DO NOT MERGE Back-port ag/2491664 am: 9a14484b 

am: 840b78e1

Change-Id: I5b2add698df347db16bfedb196793ea77b70f8a8
parents 0c07b380 840b78e1

AndroidManifest.xml

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

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

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

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



    <application android:label="@string/settings_label"

            android:icon="@mipmap/ic_launcher_settings"

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

+11 −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())

            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,12 @@ 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;