Ensure that hotseat callout only occurs when appropriate

issue 13551957

Change-Id: I87bda7eef8047edbd41f066930ed156a17d042df

1 files changed, 7 insertions, 15 deletions

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);