diff options
author | Eric Erfanian <erfanian@google.com> | 2017-05-05 15:29:54 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-05 15:29:54 +0000 |
commit | 43b3152d075138b11e1fe297682b3bbc775e5641 (patch) | |
tree | 3a325b0effac02fbd228b8ddf2f96589e5df72cd /java/com/android/incallui/answer/impl/hint/DotAnswerHint.java | |
parent | 2034759538273aed8a0b412d8fb90994eba1f7ea (diff) | |
parent | 300a8683b9c28424fb0f0c571a0abe128c461f69 (diff) |
Update Dialer to V10 RC16 am: 10b34a5ebf
am: 300a8683b9
Change-Id: If5695bad59f8a4dab6e6c90b54943b900bd2652a
Diffstat (limited to 'java/com/android/incallui/answer/impl/hint/DotAnswerHint.java')
-rw-r--r-- | java/com/android/incallui/answer/impl/hint/DotAnswerHint.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/com/android/incallui/answer/impl/hint/DotAnswerHint.java b/java/com/android/incallui/answer/impl/hint/DotAnswerHint.java index 394fe5808..70f3f73fc 100644 --- a/java/com/android/incallui/answer/impl/hint/DotAnswerHint.java +++ b/java/com/android/incallui/answer/impl/hint/DotAnswerHint.java @@ -87,7 +87,9 @@ public class DotAnswerHint implements AnswerHint { public void onBounceStart() { if (answerGestureHintAnim == null) { answerGestureHintAnim = new AnimatorSet(); - answerHintContainer.setY(puck.getY() + getDimension(R.dimen.hint_initial_offset)); + int[] puckLocation = new int[2]; + puck.getLocationInWindow(puckLocation); + answerHintContainer.setY(puckLocation[1] + getDimension(R.dimen.hint_initial_offset)); Animator fadeIn = createFadeIn(); @@ -95,7 +97,7 @@ public class DotAnswerHint implements AnswerHint { ObjectAnimator.ofFloat( answerHintContainer, View.TRANSLATION_Y, - puck.getY() - getDimension(R.dimen.hint_offset)); + puckLocation[1] - getDimension(R.dimen.hint_offset)); swipeUp.setInterpolator(new FastOutSlowInInterpolator()); swipeUp.setDuration(SWIPE_UP_DURATION_ALPHA_MILLIS); @@ -123,7 +125,7 @@ public class DotAnswerHint implements AnswerHint { answerHintLarge.setAlpha(0); answerHintLarge.setScaleX(1); answerHintLarge.setScaleY(1); - answerHintContainer.setY(puck.getY() + getDimension(R.dimen.hint_initial_offset)); + answerHintContainer.setY(puckLocation[1] + getDimension(R.dimen.hint_initial_offset)); answerHintContainer.setVisibility(View.VISIBLE); } }); |