diff options
| author | wangqi <wangqi@google.com> | 2018-02-08 11:03:13 -0800 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2018-02-09 17:37:02 -0800 |
| commit | cd197916500d2681e89685913bbfbf35ed99a3bf (patch) | |
| tree | c9a652b0afaac57175945df5fdca57b73b0ca2ba /java/com/android/incallui/answer/impl/answermethod | |
| parent | 02f601bbb9b0cd00d530e88a0b8c7ff6d810ff0d (diff) | |
Show reject hint text for all incoming calls
The function setHintText sets the hint text reject text to null when
hintText for answering a call is non-null.
Correcting so the reject text is always be set to
call_incoming_swipe_to_reject regardless of the value of hintText.
This is an upstream change from:
https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/612667
Bug: 73018780
Test: manual
PiperOrigin-RevId: 185020322
Change-Id: I413f8cf63a1b11e70300536a13c1a8a103d847cc
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 |