From 009695e477f02b13d563f17a8de0e179d7715bf9 Mon Sep 17 00:00:00 2001 From: wangqi Date: Thu, 22 Mar 2018 14:32:23 -0700 Subject: Add waiting for join banner to RTT outgoing call. Bug: 67596257 Test: manual PiperOrigin-RevId: 190126654 Change-Id: I412f8fbf5b345005f9fb3651c345303d965e4e02 --- .../com/android/incallui/rtt/impl/RttChatFragment.java | 18 ++++++++++++++++++ .../incallui/rtt/impl/res/layout/rtt_banner.xml | 10 ++++++++++ .../android/incallui/rtt/impl/res/values/strings.xml | 5 ++++- 3 files changed, 32 insertions(+), 1 deletion(-) (limited to 'java/com/android') diff --git a/java/com/android/incallui/rtt/impl/RttChatFragment.java b/java/com/android/incallui/rtt/impl/RttChatFragment.java index e14ee9b06..56ac2429c 100644 --- a/java/com/android/incallui/rtt/impl/RttChatFragment.java +++ b/java/com/android/incallui/rtt/impl/RttChatFragment.java @@ -103,6 +103,8 @@ public class RttChatFragment extends Fragment private boolean isTimerStarted; private RttOverflowMenu overflowMenu; private SecondaryInfo savedSecondaryInfo; + private TextView statusBanner; + private PrimaryInfo primaryInfo; /** * Create a new instance of RttChatFragment. @@ -221,6 +223,7 @@ public class RttChatFragment extends Fragment nameTextView = view.findViewById(R.id.rtt_name_or_number); chronometer = view.findViewById(R.id.rtt_timer); + statusBanner = view.findViewById(R.id.rtt_status_banner); return view; } @@ -334,6 +337,7 @@ public class RttChatFragment extends Fragment public void setPrimary(@NonNull PrimaryInfo primaryInfo) { LogUtil.i("RttChatFragment.setPrimary", primaryInfo.toString()); nameTextView.setText(primaryInfo.name()); + this.primaryInfo = primaryInfo; } @Override @@ -381,6 +385,20 @@ public class RttChatFragment extends Fragment chronometer.start(); isTimerStarted = true; } + if (primaryCallState.state() == State.DIALING) { + showWaitingForJoinBanner(); + } else { + hideWaitingForJoinBanner(); + } + } + + private void showWaitingForJoinBanner() { + statusBanner.setText(getString(R.string.rtt_status_banner_text, primaryInfo.name())); + statusBanner.setVisibility(View.VISIBLE); + } + + private void hideWaitingForJoinBanner() { + statusBanner.setVisibility(View.GONE); } @Override diff --git a/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml b/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml index c4d3a4290..d62cf1849 100644 --- a/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml +++ b/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml @@ -83,5 +83,15 @@ android:id="@id/rtt_on_hold_banner" android:layout_width="match_parent" android:layout_height="wrap_content"/> + \ No newline at end of file diff --git a/java/com/android/incallui/rtt/impl/res/values/strings.xml b/java/com/android/incallui/rtt/impl/res/values/strings.xml index dce16fdda..b0ac2057e 100644 --- a/java/com/android/incallui/rtt/impl/res/values/strings.xml +++ b/java/com/android/incallui/rtt/impl/res/values/strings.xml @@ -14,7 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> - + Go ahead @@ -27,4 +27,7 @@ Back + + Waiting for %s to join RTT call… + \ No newline at end of file -- cgit v1.2.3