summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/answer/impl/hint/DotAnswerHint.java
diff options
context:
space:
mode:
authorEric Erfanian <erfanian@google.com>2017-05-05 15:23:13 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-05 15:23:13 +0000
commit300a8683b9c28424fb0f0c571a0abe128c461f69 (patch)
tree3a325b0effac02fbd228b8ddf2f96589e5df72cd /java/com/android/incallui/answer/impl/hint/DotAnswerHint.java
parentd67f1627521b174f12e0c247f154c7c93c5e408e (diff)
parent10b34a5ebf12e97ecba0caf3c8e30b476b038a96 (diff)
Update Dialer to V10 RC16
am: 10b34a5ebf Change-Id: Iea3e96ccdeaf1fa796ceca702cace82ca20f298c
Diffstat (limited to 'java/com/android/incallui/answer/impl/hint/DotAnswerHint.java')
-rw-r--r--java/com/android/incallui/answer/impl/hint/DotAnswerHint.java8
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);
}
});