resolved conflicts for merge of 20884fdc to ub-launcher3-master

Change-Id: I31b49ed83bf6fa966ad68b587e6fa472e87bc0e3

1 files changed, 8 insertions, 0 deletions

diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index 458844cce..43d05a659 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -53,6 +53,7 @@ class LauncherClings implements OnClickListener, OnKeyListener {
 
     @Thunk Launcher mLauncher;
     private LayoutInflater mInflater;
+    @Thunk boolean mIsVisible;
 
     /** Ctor */
     public LauncherClings(Launcher launcher) {
@@ -108,6 +109,7 @@ class LauncherClings implements OnClickListener, OnKeyListener {
      */
     public void showMigrationCling() {
         mLauncher.onLauncherClingShown();
+        mIsVisible = true;
         mLauncher.hideWorkspaceSearchAndHotseat();
 
         ViewGroup root = (ViewGroup) mLauncher.findViewById(R.id.launcher);
@@ -134,6 +136,7 @@ class LauncherClings implements OnClickListener, OnKeyListener {
     }
 
     public void showLongPressCling(boolean showWelcome) {
+        mIsVisible = true;
         ViewGroup root = (ViewGroup) mLauncher.findViewById(R.id.launcher);
         View cling = mInflater.inflate(R.layout.longpress_cling, root, false);
 
@@ -221,6 +224,7 @@ class LauncherClings implements OnClickListener, OnKeyListener {
                     mLauncher.getSharedPrefs().edit()
                         .putBoolean(flag, true)
                         .apply();
+                    mIsVisible = false;
                     if (postAnimationCb != null) {
                         postAnimationCb.run();
                     }
@@ -234,6 +238,10 @@ class LauncherClings implements OnClickListener, OnKeyListener {
         }
     }
 
+    public boolean isVisible() {
+        return mIsVisible;
+    }
+
     /** Returns whether the clings are enabled or should be shown */
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
     private boolean areClingsEnabled() {