diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-06 23:31:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-06 23:31:58 +0000 |
| commit | 30842b209934a98a0220673e2ab6b4bf500c15d3 (patch) | |
| tree | 97dfa798809e8d909538eeaac34b4dba8725059d /java/com/android/incallui/res/layout/caller_in_conference.xml | |
| parent | 087329e9256f56b5ba8252fd7c0d5b468797cb96 (diff) | |
| parent | 2ee642d42907e76de3ffb7b13f12961b82892a9a (diff) | |
Merge changes I620aacf3,Ie5fe2fc1,I41f98fe2
* changes:
Adding Future method for DialerPhoneNumberUtil
Show on hold in management screen for conference call.
Allow for multi-line transcription error messages
Diffstat (limited to 'java/com/android/incallui/res/layout/caller_in_conference.xml')
| -rw-r--r-- | java/com/android/incallui/res/layout/caller_in_conference.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/java/com/android/incallui/res/layout/caller_in_conference.xml b/java/com/android/incallui/res/layout/caller_in_conference.xml index 4f4b2f043..37918188f 100644 --- a/java/com/android/incallui/res/layout/caller_in_conference.xml +++ b/java/com/android/incallui/res/layout/caller_in_conference.xml @@ -62,6 +62,15 @@ android:gravity="bottom" android:orientation="horizontal"> + <!-- Status (only support on hold now) --> + <TextView + android:id="@+id/conferenceCallerStatus" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/SecondaryText" + android:textColor="@color/dialer_secondary_text_color_hiden" + android:visibility="gone"/> + <!-- Number --> <TextView android:id="@+id/conferenceCallerNumber" |