diff options
| author | sail <sail@google.com> | 2017-06-27 10:55:49 -0700 |
|---|---|---|
| committer | Brandon Maxwell <maxwelb@google.com> | 2017-06-30 14:35:27 -0700 |
| commit | e85fa664ac1e7394a7e9e5d0c8dc61ba1e33ab1c (patch) | |
| tree | 45eca16c212165d1380800f49de0f5bad9329c63 /java/com/android/dialer/app/res | |
| parent | def8100bfce62eaa16d150430c6f99e6a3d8afa1 (diff) | |
Automated g4 rollback of changelist 159993127.
*** Reason for rollback ***
This CL causes a crash when swapping SIMs.
*** Original change description ***
Adding voicemail transcription branding and progress UI
screen shot showing branding (its harder to capture the progress UI):
https://drive.google.com/open?id=0B9o_KvtLkcuIdkkycVo1RFhsaENYV3J2Yi1LWnJzR0FfSHJR
***
Bug: 63059930
Test: N/A
PiperOrigin-RevId: 160296762
Change-Id: Ib8d709d03d6d8a3fee4a0c384c15df00f55cb182
Diffstat (limited to 'java/com/android/dialer/app/res')
| -rw-r--r-- | java/com/android/dialer/app/res/layout/call_log_list_item.xml | 34 | ||||
| -rw-r--r-- | java/com/android/dialer/app/res/values/colors.xml | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/app/res/values/strings.xml | 9 |
3 files changed, 8 insertions, 37 deletions
diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item.xml b/java/com/android/dialer/app/res/layout/call_log_list_item.xml index fd31fc2fc..afb50ffba 100644 --- a/java/com/android/dialer/app/res/layout/call_log_list_item.xml +++ b/java/com/android/dialer/app/res/layout/call_log_list_item.xml @@ -148,35 +148,17 @@ android:visibility="gone" android:singleLine="true"/> - <LinearLayout - android:id="@+id/transcription" + <TextView + android:id="@+id/voicemail_transcription" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/call_log_icon_margin" - android:orientation="vertical"> - - <TextView - android:id="@+id/voicemail_transcription_branding" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/call_log_voicemail_transcript_branding_color" - android:textSize="@dimen/call_log_voicemail_transcription_text_size" - android:paddingBottom="2dp" - android:visibility="gone" - android:singleLine="true"/> - - <TextView - android:id="@+id/voicemail_transcription" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/call_log_voicemail_transcript_color" - android:textSize="@dimen/call_log_voicemail_transcription_text_size" - android:ellipsize="marquee" - android:visibility="gone" - android:singleLine="false" - android:maxLines="10"/> - - </LinearLayout> + android:textColor="@color/call_log_voicemail_transcript_color" + android:textSize="@dimen/call_log_voicemail_transcription_text_size" + android:ellipsize="marquee" + android:visibility="gone" + android:singleLine="false" + android:maxLines="10"/> </LinearLayout> diff --git a/java/com/android/dialer/app/res/values/colors.xml b/java/com/android/dialer/app/res/values/colors.xml index b13020ecd..2f6d87b49 100644 --- a/java/com/android/dialer/app/res/values/colors.xml +++ b/java/com/android/dialer/app/res/values/colors.xml @@ -36,8 +36,6 @@ <color name="call_log_detail_color">#8a000000</color> <!-- 87% black --> <color name="call_log_voicemail_transcript_color">#de000000</color> - <!-- 54% black --> - <color name="call_log_voicemail_transcript_branding_color">#8a000000</color> <!-- 70% black --> <color name="call_log_action_color">#b3000000</color> <!-- 54% black --> diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml index e9c1d2427..5549881c3 100644 --- a/java/com/android/dialer/app/res/values/strings.xml +++ b/java/com/android/dialer/app/res/values/strings.xml @@ -930,15 +930,6 @@ <!-- Label for setting that shows more information about the Phone app [CHAR LIMIT=30] --> <string name="about_phone_label">About</string> - <!-- Label indicating who provided the voicemail transcription [CHAR LIMIT=30] --> - <string name="voicemail_transcription_branding_text">Transcribed by Google</string> - - <!-- Label indicating that a voicemail transcription is in progress [CHAR LIMIT=30] --> - <string name="voicemail_transcription_in_progress">Google is transcribing...</string> - - <!-- Label indicating that a voicemail transcription failed [CHAR LIMIT=30] --> - <string name="voicemail_transcription_failed">Transcript not available</string> - <!-- Button text to prompt a user to open an sms conversation [CHAR LIMIT=NONE] --> <string name="view_conversation">View</string> |