Update search drawable when dialpad is hidden

We were not clearing the second search coachmark
when the dialpad coachmark get cleared.

Ticket(s): CD-521 CD-512
Change-Id: I19362191c940443b504930de6cac416ff05047b0

3 files changed, 18 insertions, 8 deletions

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 90f901ce8..283466e74 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -981,8 +981,10 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
             }
             if (mInRegularSearch) {
                 mRegularSearchFragment.updateCallCreditInfo();
+                mRegularSearchFragment.updateCoachMarkDrawable();
             } else {
                 mSmartDialSearchFragment.updateCallCreditInfo();
+                mSmartDialSearchFragment.updateCoachMarkDrawable();
             }
         }
     }
diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java
index 2088e2405..484969e12 100644
--- a/src/com/android/dialer/list/SearchFragment.java
+++ b/src/com/android/dialer/list/SearchFragment.java
@@ -174,14 +174,7 @@ public class SearchFragment extends PhoneNumberPickerFragment
             listView.setOnTouchListener(mActivityOnTouchListener);
         }
 
-        DialtactsActivity da = (DialtactsActivity) mActivity;
-        if (da != null && da.isInSearchUi()) {
-
-            String unFormattedString = getString(R.string.provider_search_help);
-            CoachMarkDrawableHelper.assignViewTreeObserverWithHeight(parentView, da,
-                    da.getSearchTextLayout(), mActivity.getActionBarHeight(), true,
-                    da.getSearchEditText(), unFormattedString, 0.8f);
-        }
+        updateCoachMarkDrawable();
 
         updatePosition(false /* animate */);
     }
@@ -226,6 +219,17 @@ public class SearchFragment extends PhoneNumberPickerFragment
         mAddToContactNumber = addToContactNumber;
     }
 
+    public void updateCoachMarkDrawable() {
+        DialtactsActivity da = (DialtactsActivity) mActivity;
+        if (da != null && da.isInSearchUi()) {
+
+            String unFormattedString = getString(R.string.provider_search_help);
+            CoachMarkDrawableHelper.assignViewTreeObserverWithHeight(getView(), da,
+                    da.getSearchTextLayout(), mActivity.getActionBarHeight(), true,
+                    da.getSearchEditText(), unFormattedString, 0.8f);
+        }
+    }
+
     /**
      * Return true if phone number is prohibited by a value -
      * (R.string.config_prohibited_phone_number_regexp) in the config files. False otherwise.
diff --git a/src/com/android/dialer/util/CoachMarkDrawableHelper.java b/src/com/android/dialer/util/CoachMarkDrawableHelper.java
index 10e66b6dc..800aa0403 100644
--- a/src/com/android/dialer/util/CoachMarkDrawableHelper.java
+++ b/src/com/android/dialer/util/CoachMarkDrawableHelper.java
@@ -59,6 +59,8 @@ public class CoachMarkDrawableHelper {
                             unformatted, touch, pref, cmi, 1.0f);
                 }
             });
+        } else {
+            main.getOverlay().clear();
         }
     }
 
@@ -81,6 +83,8 @@ public class CoachMarkDrawableHelper {
                             touch, pref, cmi, fontWidthScale);
                 }
             });
+        } else {
+            main.getOverlay().clear();
         }
     }