am 5eed5d8c: Ensure that hotseat callout only occurs when appropriate

* commit '5eed5d8c7b7ca78dd07bc6d441600cb97e0782a1':
  Ensure that hotseat callout only occurs when appropriate

2 files changed, 10 insertions, 15 deletions

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index d1d4ee6da..dc5674c25 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4434,6 +4434,9 @@ public class Launcher extends Activity
         }
     }
 
+    protected boolean shouldClingFocusHotseatApp() {
+        return false;
+    }
     protected String getFirstRunClingSearchBarHint() {
         return "";
     }
diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index 6d84e2be7..1176aa572 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -264,21 +264,13 @@ class LauncherClings {
                 WORKSPACE_CLING_DISMISSED_KEY, false)) {
             Cling c = initCling(R.id.workspace_cling, 0, false, true);
             c.updateWorkspaceBubblePosition();
-
-            try {
-                // We only enable the focused hotseat app if we are preinstalled
-                PackageManager pm = mLauncher.getPackageManager();
-                ApplicationInfo ai = pm.getApplicationInfo(mLauncher.getPackageName(), 0);
-                if ((ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
-                    // Set the focused hotseat app
-                    c.setFocusedHotseatApp(mLauncher.getFirstRunFocusedHotseatAppDrawableId(),
-                        mLauncher.getFirstRunFocusedHotseatAppRank(),
-                        mLauncher.getFirstRunFocusedHotseatAppComponentName(),
-                        mLauncher.getFirstRunFocusedHotseatAppBubbleTitle(),
-                        mLauncher.getFirstRunFocusedHotseatAppBubbleDescription());
-                }
-            } catch (PackageManager.NameNotFoundException e) {
-                e.printStackTrace();
+            if (mLauncher.shouldClingFocusHotseatApp()) {
+                // Set the focused hotseat app
+                c.setFocusedHotseatApp(mLauncher.getFirstRunFocusedHotseatAppDrawableId(),
+                    mLauncher.getFirstRunFocusedHotseatAppRank(),
+                    mLauncher.getFirstRunFocusedHotseatAppComponentName(),
+                    mLauncher.getFirstRunFocusedHotseatAppBubbleTitle(),
+                    mLauncher.getFirstRunFocusedHotseatAppBubbleDescription());
             }
         } else {
             removeCling(R.id.workspace_cling);