commit fd058ab872d41b469e4da2d9b261dd2c9d1dffe0
author Raff Tsai <rafftsai@google.com> Wed May 29 18:30:24 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 29 18:30:24 2019 -0700
tree a814ec260d443fb0b73d1c0c2ad78221b2c625cf
parent 9f280a15a2c96c4e0fb0ac650cdc4053a4651ed3
parent 811229a2fd7687a6682764c484f97fbfb4958ecb

Merge "Do not allow draw on top for App notification settings" into oc-dev
am: 811229a2fd

Change-Id: Ie5ed40b8f573b974850234987bacc5ae7db925a4

src/com/android/settings/notification/AppNotificationSettings.java

diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 5cac0bb..4646cdc 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -17,6 +17,8 @@
 package com.android.settings.notification;
 
 import android.app.Activity;
+import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
@@ -32,6 +34,8 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Switch;
+import android.view.Window;
+import android.view.WindowManager;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.AppHeader;
@@ -76,6 +80,9 @@
     public void onResume() {
         super.onResume();
 
+        getActivity().getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+        android.util.EventLog.writeEvent(0x534e4554, "119115683", -1, "");
+
         if (mUid < 0 || TextUtils.isEmpty(mPkg) || mPkgInfo == null) {
             Log.w(TAG, "Missing package or uid or packageinfo");
             finish();
@@ -125,6 +132,15 @@
         updateDependents(mAppRow.banned);
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        final Window window = getActivity().getWindow();
+        final WindowManager.LayoutParams attrs = window.getAttributes();
+        attrs.privateFlags &= ~PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+        window.setAttributes(attrs);
+    }
+
     private void addHeaderPref() {
         ArrayMap<String, AppRow> rows = new ArrayMap<>();
         rows.put(mAppRow.pkg, mAppRow);