diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-10 03:14:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-10 03:14:38 +0000 |
| commit | bb6a02d26f2a6f8deb2807e26be05f2df6bc066b (patch) | |
| tree | 4c0272b2e20a9d9bd5f90d22fa902888a1352df3 /java/com/android/incallui/answer/impl/answermethod | |
| parent | 02f601bbb9b0cd00d530e88a0b8c7ff6d810ff0d (diff) | |
| parent | 33e19a9ce152a2123ab5e2ce39bc140ff92bfa3c (diff) | |
Merge changes I43cc987c,I99ef5ccf,Icae34dd6,I161b5127,I4740c0f4, ...
* changes:
Update title of after call spam dialog.
Used VectorDrawable for Blocked Numbers
Finish AudioRouteSelectorActivity when all calls disconnect.
Add LookupUri to PeopApiPhoneLookupInfo
Implemented NUI menu items.
Implemented GoogleMainSearchController to customize menu to GoogleDialer.
Show reject hint text for all incoming calls
Diffstat (limited to 'java/com/android/incallui/answer/impl/answermethod')
| -rw-r--r-- | java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java b/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java index ebbaef8e5..fe6bbbca5 100644 --- a/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java +++ b/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java @@ -370,11 +370,10 @@ public class FlingUpDownMethod extends AnswerMethod implements OnProgressChanged public void setHintText(@Nullable CharSequence hintText) { if (hintText == null) { swipeToAnswerText.setText(R.string.call_incoming_swipe_to_answer); - swipeToRejectText.setText(R.string.call_incoming_swipe_to_reject); } else { swipeToAnswerText.setText(hintText); - swipeToRejectText.setText(null); } + swipeToRejectText.setText(R.string.call_incoming_swipe_to_reject); } @Override |