summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Bird <sbird@cyngn.com>2016-04-12 14:15:17 -0700
committerStephen Bird <sbird@cyngn.com>2016-04-15 10:27:33 -0700
commit7c88b513ac210919e5595dce33cee77aa1c71985 (patch)
treebf1cb60e5a8a4e6e7c61fe0781a177cc433fb422
parent749d5f8c140a61572251f17fc24a2d06601e2746 (diff)
downloadandroid_packages_apps_Dialer-7c88b513ac210919e5595dce33cee77aa1c71985.tar.gz
android_packages_apps_Dialer-7c88b513ac210919e5595dce33cee77aa1c71985.tar.bz2
android_packages_apps_Dialer-7c88b513ac210919e5595dce33cee77aa1c71985.zip
Search: Only clear focus if we are showing a coachmark
Coachmarks are supposed to require the user to dismiss them, so only clear that focus if the user sees one instead of every time they see the search bar. Ticket: NIGHTLIES-2820 CD-373 Change-Id: I3f43848cfd10b13ed8ef583ff9ffb615e749aa63
-rw-r--r--src/com/android/dialer/DialtactsActivity.java1
-rw-r--r--src/com/android/dialer/util/CoachMarkDrawableHelper.java1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 2e08dc6cf..7348c1599 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -1206,7 +1206,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
mListsFragment.getView().animate().alpha(0).withLayer();
}
- mSearchView.clearFocus();
mListsFragment.setUserVisibleHint(false);
}
diff --git a/src/com/android/dialer/util/CoachMarkDrawableHelper.java b/src/com/android/dialer/util/CoachMarkDrawableHelper.java
index 800aa0403..bae9767dc 100644
--- a/src/com/android/dialer/util/CoachMarkDrawableHelper.java
+++ b/src/com/android/dialer/util/CoachMarkDrawableHelper.java
@@ -74,6 +74,7 @@ public class CoachMarkDrawableHelper {
.getSharedPreferences(DialtactsActivity.SHARED_PREFS_NAME, Context.MODE_PRIVATE);
final CallMethodInfo cmi = shouldShowCoachMark(pref);
if (cmi != null) {
+ touch.clearFocus();
ViewTreeObserver vto = v.getViewTreeObserver();
vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@Override