commit 10a1bd0e652ec7ea3e3ee861fc0d72261a33a3fd
author Sunny Goyal <sunnygoyal@google.com> Mon Oct 09 14:56:21 2017 -0700
committer Sunny Goyal <sunnygoyal@google.com> Tue Oct 10 10:28:05 2017 -0700
tree e7584efee3c997b6d4f127f910e06c00b303bd16
parent 271e219ea3423ada57a55b54395beeef64fb401c

Converting PopupContainerWithArrow into a base class so that it is easier
to create other types of popup

Bug: 67585158
Change-Id: I966ae7bb90f941951b26feaf71b3ea30c3f3c0cc

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 2945b22..1bb4807 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -87,7 +87,6 @@
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
 import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsTransitionController;
-import com.android.launcher3.anim.AnimationLayerSet;
 import com.android.launcher3.compat.AppWidgetManagerCompat;
 import com.android.launcher3.compat.LauncherAppsCompat;
 import com.android.launcher3.compat.LauncherAppsCompatVO;
@@ -110,6 +109,7 @@
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.notification.NotificationListener;
 import com.android.launcher3.pageindicators.PageIndicator;
+import com.android.launcher3.popup.BaseActionPopup;
 import com.android.launcher3.popup.PopupContainerWithArrow;
 import com.android.launcher3.popup.PopupDataProvider;
 import com.android.launcher3.shortcuts.DeepShortcutManager;
@@ -1347,9 +1347,9 @@
                 mWorkspace.updateIconBadges(updatedBadges);
                 mAppsView.updateIconBadges(updatedBadges);
 
-                PopupContainerWithArrow popup = PopupContainerWithArrow.getOpen(Launcher.this);
-                if (popup != null) {
-                    popup.updateNotificationHeader(updatedBadges);
+                BaseActionPopup popup = BaseActionPopup.getOpen(Launcher.this);
+                if (popup instanceof PopupContainerWithArrow) {
+                    ((PopupContainerWithArrow) popup).updateNotificationHeader(updatedBadges);
                 }
             }
         };
@@ -3558,7 +3558,7 @@
                             && mAccessibilityDelegate.performAction(focusedView,
                                     (ItemInfo) focusedView.getTag(),
                                     LauncherAccessibilityDelegate.DEEP_SHORTCUTS)) {
-                        PopupContainerWithArrow.getOpen(this).requestFocus();
+                        BaseActionPopup.getOpen(this).requestFocus();
                         return true;
                     }
                     break;