summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/app
diff options
context:
space:
mode:
authorcalderwoodra <calderwoodra@google.com>2017-08-04 15:35:17 -0700
committerEric Erfanian <erfanian@google.com>2017-08-09 11:48:26 -0700
commit1741e1e8c3df100ed2c72a31273ac3e5b9144d80 (patch)
treeaa1515559170d59d65ecb32d853d5cfd72afe900 /java/com/android/dialer/app
parentcd49d581edf212045905b04331bc60d980697208 (diff)
New search fragment now animates and moves with the search box and dialpad.
video: https://drive.google.com/open?id=0B2Hce9qilHmvYTlqVGU0OTNxNjQ Bug: 37209462 Test: SearchFragmentIntegrationTest PiperOrigin-RevId: 164319452 Change-Id: Icc5669be87e97ba5d0e23fc99bada28ca7d2335a
Diffstat (limited to 'java/com/android/dialer/app')
-rw-r--r--java/com/android/dialer/app/DialtactsActivity.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java
index 1c9718e40..99a16d931 100644
--- a/java/com/android/dialer/app/DialtactsActivity.java
+++ b/java/com/android/dialer/app/DialtactsActivity.java
@@ -678,6 +678,7 @@ public class DialtactsActivity extends TransactionSafeActivity
mListsFragment.addOnPageChangeListener(this);
} else if (fragment instanceof NewSearchFragment) {
mNewSearchFragment = (NewSearchFragment) fragment;
+ updateSearchFragmentPosition();
}
if (fragment instanceof SearchFragment) {
final SearchFragment searchFragment = (SearchFragment) fragment;
@@ -951,6 +952,12 @@ public class DialtactsActivity extends TransactionSafeActivity
// available immediately which is required to update position. By forcing an animation,
// position will be updated after a delay by when the dialpad height would be available.
fragment.updatePosition(true /* animate */);
+ } else if (mNewSearchFragment != null) {
+ int animationDuration = getResources().getInteger(R.integer.dialpad_slide_in_duration);
+ int shadowHeight = getResources().getDrawable(R.drawable.search_shadow).getIntrinsicHeight();
+ int start = isDialpadShown() ? mActionBarHeight - shadowHeight : 0;
+ int end = isDialpadShown() ? 0 : mActionBarHeight - shadowHeight;
+ mNewSearchFragment.animatePosition(start, end, animationDuration);
}
}