diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-10-24 14:05:52 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-10-24 14:05:52 -0700 |
| commit | 938468da6f5c225ebb161a68bd949c9cf3261892 (patch) | |
| tree | 232533fa35dc9d140fdfe0dac82b2bd21ad1b5c4 /java/com/android/incallui/answer | |
| parent | 958b292fc04ad15879fff47df929d6d1a826615c (diff) | |
Rename the new bubble package name from "bubble" to "newbubble".
It fixes AOSP for package name conflict.
Test: manual
PiperOrigin-RevId: 173298696
Change-Id: Id10ebe0bcf029e61f65cf6580c7198abd8395081
Diffstat (limited to 'java/com/android/incallui/answer')
| -rw-r--r-- | java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java | 4 | ||||
| -rw-r--r-- | java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java b/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java index ea5956c8c..ebbaef8e5 100644 --- a/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java +++ b/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java @@ -421,9 +421,7 @@ public class FlingUpDownMethod extends AnswerMethod implements OnProgressChanged // spec timeline can be divided into 9 slots. Each slot is equivalent to 83ms in the spec. // Therefore, we use 9 slots of 83ms to map user gesture into the spec timeline. // - // See specs - - // Accept: https://direct.googleplex.com/#/spec/8510001 - // Decline: https://direct.googleplex.com/#/spec/3850001 + final float progressSlots = 9; // Fade out the "swipe up to answer". It only takes 1 slot to complete the fade. diff --git a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml index 2dc274b05..d79da8843 100644 --- a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml +++ b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml @@ -87,7 +87,7 @@ android:layout_marginEnd="24dp"/> <!-- We have to keep deprecated singleLine to allow long text being truncated with ellipses. - b/31396406 --> + a bug --> <com.android.incallui.autoresizetext.AutoResizeTextView android:id="@id/contactgrid_contact_name" android:layout_width="wrap_content" |