Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "am-641f3aa3-ebd9-46aa-8f39-1f4ec4f86eb3" into oc-dev am: 7af053390a

Browse Source 
am: 21cd2569bf

Change-Id: If444013b7d35152ca49ccc20a89841b1e5582c62
This commit is contained in:
Bryan Ferris
2019-06-05 17:41:32 -07:00
committed by android-build-merger
parent 7eec0a8448 21cd2569bf
commit 4871c475b2
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/VpnDialogs/AndroidManifest.xml
View File

@@ -21,6 +21,7 @@
<uses-permission android:name="android.permission.CONTROL_VPN" />
<uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
<uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
<application android:label="VpnDialogs"
android:allowBackup="false" >

3
packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java
View File

@@ -16,6 +16,8 @@
package com.android.vpndialogs;
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.PackageManager;
@@ -78,6 +80,7 @@ public class ConfirmDialog extends AlertActivity
setupAlert();
getWindow().setCloseOnTouchOutside(false);
getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
Button button = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
button.setFilterTouchesWhenObscured(true);
}