diff options
author | Eric Erfanian <erfanian@google.com> | 2017-05-04 08:23:17 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-05-04 14:04:39 -0700 |
commit | 10b34a5ebf12e97ecba0caf3c8e30b476b038a96 (patch) | |
tree | 3a325b0effac02fbd228b8ddf2f96589e5df72cd /java/com/android/dialer/app/widget | |
parent | 8369df095a73a77b3715f8ae7ba06089cebca4ce (diff) | |
download | android_packages_apps_Dialer-10b34a5ebf12e97ecba0caf3c8e30b476b038a96.tar.gz android_packages_apps_Dialer-10b34a5ebf12e97ecba0caf3c8e30b476b038a96.tar.bz2 android_packages_apps_Dialer-10b34a5ebf12e97ecba0caf3c8e30b476b038a96.zip |
Update Dialer to V10 RC16
This release was created following the instructions at:
go/dialer-aosp-release
Subsequent dialer releases will follow as O bugs are
fixed, until we reach our final RC.
Version: 10
Candidate: RC16
Branch: dialer-android_release_branch/153304843.1
dialer-android/dialer-android_20170416.00/dialer-android_20170416.00_RC16
This release contains the following bug fixes since RC00:
Bug: 37324705 35304403 36067503 35304446 33203808 37280992
37346084 35766990 37481880 37424493 36470282 37347691
37519015 37168472 35805360 37545472 27704934 36515614
35766990 37577470 34739750 35801628 36788693 35264204
36708536 37628370 36904650 37314436 37642171 37530847
37637799 37666625 37548549 37648036 37636412 37323529
37630507 35919141 37198343 37548572 36178218 37640315
37663896 37720467 37275944 37710497 31634477 37744796
37348506 37744796 37568534 37672424 34872683 34873026
37681461 34873295 37748373 37526812 37618638 37663896
37536088 37727455 37165687 36651204 36900708 37323529
36902926 37256480 37328353 37432034 37436952 34093562
37720889 37321935 37780300 37781115 37755902 36588206
34258266 37290464 37698062 37618638 37473004 37432034
37918676 37870494 37722091
Test: make, on device
Change-Id: I99e1a484ccd578c1f8a13e7a6a4b4952f0791297
Diffstat (limited to 'java/com/android/dialer/app/widget')
-rw-r--r-- | java/com/android/dialer/app/widget/ActionBarController.java | 29 | ||||
-rw-r--r-- | java/com/android/dialer/app/widget/SearchEditTextLayout.java | 9 |
2 files changed, 30 insertions, 8 deletions
diff --git a/java/com/android/dialer/app/widget/ActionBarController.java b/java/com/android/dialer/app/widget/ActionBarController.java index d0eb326ab..c1b4cc2b4 100644 --- a/java/com/android/dialer/app/widget/ActionBarController.java +++ b/java/com/android/dialer/app/widget/ActionBarController.java @@ -49,6 +49,20 @@ public class ActionBarController { } }; + private final AnimationCallback mFadeInCallback = + new AnimationCallback() { + @Override + public void onAnimationEnd() { + slideActionBar(false /* slideUp */, false /* animate */); + } + + @Override + public void onAnimationCancel() { + slideActionBar(false /* slideUp */, false /* animate */); + } + }; + private ValueAnimator mAnimator; + public ActionBarController(ActivityUi activityUi, SearchEditTextLayout searchBox) { mActivityUi = activityUi; mSearchBox = searchBox; @@ -107,7 +121,7 @@ public class ActionBarController { } slideActionBar(false /* slideUp */, true /* animate */); } else { - mSearchBox.fadeIn(); + mSearchBox.fadeIn(mFadeInCallback); } } } @@ -129,14 +143,18 @@ public class ActionBarController { public void slideActionBar(boolean slideUp, boolean animate) { LogUtil.d("ActionBarController.slidingActionBar", "up: %b, animate: %b", slideUp, animate); + if (mAnimator != null && mAnimator.isRunning()) { + mAnimator.cancel(); + mAnimator.removeAllUpdateListeners(); + } if (animate) { - ValueAnimator animator = slideUp ? ValueAnimator.ofFloat(0, 1) : ValueAnimator.ofFloat(1, 0); - animator.addUpdateListener( + mAnimator = slideUp ? ValueAnimator.ofFloat(0, 1) : ValueAnimator.ofFloat(1, 0); + mAnimator.addUpdateListener( animation -> { final float value = (float) animation.getAnimatedValue(); setHideOffset((int) (mActivityUi.getActionBarHeight() * value)); }); - animator.start(); + mAnimator.start(); } else { setHideOffset(slideUp ? mActivityUi.getActionBarHeight() : 0); } @@ -147,8 +165,7 @@ public class ActionBarController { mSearchBox.animate().alpha(alphaValue).start(); } - public void setHideOffset(int offset) { - mIsActionBarSlidUp = offset >= mActivityUi.getActionBarHeight(); + private void setHideOffset(int offset) { mActivityUi.setActionBarHideOffset(offset); } diff --git a/java/com/android/dialer/app/widget/SearchEditTextLayout.java b/java/com/android/dialer/app/widget/SearchEditTextLayout.java index be850f9a0..f83c48288 100644 --- a/java/com/android/dialer/app/widget/SearchEditTextLayout.java +++ b/java/com/android/dialer/app/widget/SearchEditTextLayout.java @@ -95,11 +95,11 @@ public class SearchEditTextLayout extends FrameLayout { // Convert a long click into a click to expand the search box, and then long click on the // search view. This accelerates the long-press scenario for copy/paste. - mCollapsedSearchBox.setOnLongClickListener( + mCollapsed.setOnLongClickListener( new OnLongClickListener() { @Override public boolean onLongClick(View view) { - mCollapsedSearchBox.performClick(); + mCollapsed.performClick(); mSearchView.performLongClick(); return false; } @@ -188,6 +188,11 @@ public class SearchEditTextLayout extends FrameLayout { mIsFadedOut = false; } + public void fadeIn(AnimUtils.AnimationCallback callback) { + AnimUtils.fadeIn(this, ANIMATION_DURATION, AnimUtils.NO_DELAY, callback); + mIsFadedOut = false; + } + public void setVisible(boolean visible) { if (visible) { setAlpha(1); |