commit 0d68dad4e0fde69e1a1e85efc19840363f4f9539
author Andrew Lee <anwlee@google.com> Fri May 16 22:57:34 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 16 22:57:35 2014 +0000
tree cba6429afe29de4259d02cb61547c1f863d531e1
parent 2239ec70b0733d655968b10176562f1aee4ad7a8
parent dbe9a8c18bec55943c2239f1381774a6a4ba2a59

Merge "Fix fragment position in dialpad fade-out."

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index fe29d2c..6fdf549 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -588,6 +588,7 @@
         mIsDialpadShown = false;
         mDialpadFragment.setAnimate(animate);
 
+        updateSearchFragmentPosition();
         updateFloatingActionButton();
         if (animate) {
             Animation slideOut = AnimationUtils.loadAnimation(this, R.anim.slide_out);
@@ -602,7 +603,6 @@
             commitDialpadFragmentHide();
         }
 
-        updateSearchFragmentPosition();
         mListsFragment.maybeShowActionBar();
     }
 
@@ -618,9 +618,9 @@
     private void updateSearchFragmentPosition() {
         int translationValue = mIsDialpadShown ?  -mActionBarHeight : 0;
         SearchFragment fragment = null;
-        if (mInDialpadSearch) {
+        if (mSmartDialSearchFragment != null && mSmartDialSearchFragment.isVisible()) {
             fragment = mSmartDialSearchFragment;
-        } else if (mInRegularSearch) {
+        } else if (mRegularSearchFragment != null && mRegularSearchFragment.isVisible()) {
             fragment = mRegularSearchFragment;
         }
         if (fragment != null && fragment.isVisible()) {