Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev

am: 9f3bac52ee

Change-Id: I111fe0d4adffd228f4afd8daa79a706d17c328ec

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

@@ -5786,15 +5786,18 @@ public class StatusBar extends SystemUI implements DemoMode,
                         boolean handled = superOnClickHandler(view, pendingIntent, fillInIntent);
 
                         // close the shade if it was open
-                        if (handled) {
+                        if (handled && !mNotificationPanel.isFullyCollapsed()) {
                             animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
                                     true /* force */);
                             visibilityChanged(false);
                             mAssistManager.hideAssist();
-                        }
 
                             // Wait for activity start.
-                        return handled;
+                            return true;
+                        } else {
+                            return false;
+                        }
+
                     }
                 }, afterKeyguardGone);
                 return true;
@@ -6844,12 +6847,16 @@ public class StatusBar extends SystemUI implements DemoMode,
                     }
                 }.start();
 
+                if (!mNotificationPanel.isFullyCollapsed()) {
                     // close the shade if it was open
                     animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
                             true /* force */, true /* delayed */);
                     visibilityChanged(false);
 
                     return true;
+                } else {
+                    return false;
+                }
             }
         }, afterKeyguardGone);
     }
@@ -7001,12 +7008,16 @@ public class StatusBar extends SystemUI implements DemoMode,
                         new Thread(runnable).start();
                     }
 
+                    if (!mNotificationPanel.isFullyCollapsed()) {
                         // close the shade if it was open
                         animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
                                 true /* force */, true /* delayed */);
                         visibilityChanged(false);
 
                         return true;
+                    } else {
+                        return false;
+                    }
                 }
             }, afterKeyguardGone);
         }

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

@@ -226,7 +226,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
             if (mOccluded && !mDozing) {
                 mStatusBar.hideKeyguard();
                 mStatusBar.stopWaitingForKeyguardExit();
+                if (hideBouncerWhenShowing || mBouncer.needsFullscreenBouncer()) {
                     hideBouncer(false /* destroyView */);
+                }
             } else {
                 showBouncerOrKeyguard(hideBouncerWhenShowing);
             }