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

am: 811229a2fd

Change-Id: Ie5ed40b8f573b974850234987bacc5ae7db925a4

diff --cc src/com/android/settings/notification/AppNotificationSettings.java
index 5cac0bb,4e578f4..4646cdc
--- 1/src/com/android/settings/notification/AppNotificationSettings.java
--- 2/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@@ -16,7 -16,13 +16,9 @@@
  
  package com.android.settings.notification;
  
 -import static android.app.NotificationManager.IMPORTANCE_LOW;
 -import static android.app.NotificationManager.IMPORTANCE_NONE;
 -import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
 -
  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;
@@@ -125,8 -133,17 +132,17 @@@ public class AppNotificationSettings ex
          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<String, AppRow>();
 +        ArrayMap<String, AppRow> rows = new ArrayMap<>();
          rows.put(mAppRow.pkg, mAppRow);
          collectConfigActivities(rows);
          final Activity activity = getActivity();