PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use new no overlay flag instead app ops" into oc-mr1-dev am: 9cb867d6e3

Browse Source 
am: 6adbad6937

Change-Id: I0b60e9cd77643f5b2a22c5d09ddb2994d28ec82a
This commit is contained in:
Svet Ganov
2017-10-04 21:01:27 +00:00
committed by android-build-merger
parent 964ff7aa66 6adbad6937
commit 9bbc0cc38a
5 changed files with 62 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
View File

@@ -35,15 +35,13 @@ import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
import android.os.Bundle;
import android.os.UserHandle;
import android.provider.Settings;
import android.provider.SettingsStringUtil;
import android.util.Slog;
import android.view.WindowManager;
import android.view.accessibility.AccessibilityEvent;
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
import com.android.settings.R;
import com.android.settings.core.TouchOverlayManager;
/** @hide */
public class NotificationAccessConfirmationActivity extends Activity
@@ -54,14 +52,12 @@ public class NotificationAccessConfirmationActivity extends Activity
private int mUserId;
private ComponentName mComponentName;
private TouchOverlayManager mTouchOverlayManager;
private NotificationManager mNm;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mTouchOverlayManager = new TouchOverlayManager(this);
mNm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
mComponentName = getIntent().getParcelableExtra(EXTRA_COMPONENT_NAME);
@@ -87,6 +83,20 @@ public class NotificationAccessConfirmationActivity extends Activity
getWindow().setCloseOnTouchOutside(false);
}
@Override
public void onResume() {
super.onResume();
getWindow().addFlags(
WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
}
@Override
public void onPause() {
getWindow().clearFlags(
WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
super.onPause();
}
private void onAllow() {
String requiredPermission = Manifest.permission.BIND_NOTIFICATION_LISTENER_SERVICE;
try {
@@ -130,16 +140,4 @@ public class NotificationAccessConfirmationActivity extends Activity
finish();
}
}
@Override
protected void onResume() {
super.onResume();
mTouchOverlayManager.setOverlayAllowed(false);
}
@Override
protected void onPause() {
super.onPause();
mTouchOverlayManager.setOverlayAllowed(true);
}
}