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

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

Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba

am: 54e508ca

Change-Id: I87608a5fc71634d99adaf2aecd1e1c1be297659f
parents d68bd495 54e508ca
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@
    <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
    <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
    <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />

    <application android:label="@string/settings_label"
            android:icon="@mipmap/ic_launcher_settings"
+8 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.MotionEvent;
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;
@@ -55,6 +57,8 @@ import com.android.settingslib.accessibility.AccessibilityUtils;

import java.util.List;

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

public class ToggleAccessibilityServicePreferenceFragment
        extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener {

@@ -178,6 +182,10 @@ public class ToggleAccessibilityServicePreferenceFragment

                ad.create();
                ad.getButton(AlertDialog.BUTTON_POSITIVE).setOnTouchListener(filterTouchListener);
                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: {