diff options
Diffstat (limited to 'java/com/android/dialer/app/voicemail/error/res')
3 files changed, 22 insertions, 12 deletions
diff --git a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml b/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml index 184a81fec..4e143a59a 100644 --- a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml +++ b/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml @@ -73,6 +73,7 @@ android:paddingEnd="16dp" android:paddingTop="10dp" android:paddingBottom="10dp" + android:background="#ffffffff" android:orientation="horizontal"> <TextView android:id="@+id/voicemail_tos_button_decline" @@ -82,7 +83,7 @@ android:layout_height="wrap_content" android:text="@string/verizon_terms_and_conditions_decline_english"/> <android.support.v4.widget.Space - android:layout_width="0dp" + android:layout_width="8dp" android:layout_height="match_parent" android:layout_weight="1"/> <TextView diff --git a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml index eb4877a4b..05082d8d9 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml @@ -140,6 +140,8 @@ <string name="verizon_terms_and_conditions_message"><xliff:g>%1$s</xliff:g> By turning on visual voicemail you agree to the Verizon Wireless terms and conditions:\n\n<xliff:g>%2$s</xliff:g></string> <string name="dialer_terms_and_conditions_title">Turn on visual voicemail</string> + + <string name="dialer_terms_and_conditions_existing_user_title">New! Read your voicemail</string> <string name="dialer_terms_and_conditions_message"><xliff:g>%s</xliff:g></string> <string translatable="false" name="verizon_terms_and_conditions_1.1_english"> @@ -173,14 +175,16 @@ Si no acepta todos estos términos y condiciones, no use el buzón de voz visual See and listen to your messages, without having to call voicemail. Transcripts of your voicemail are provided by Google’s free transcription service. <xliff:g>%s</xliff:g> </string> + <string name="dialer_terms_and_conditions_existing_user"> + Transcripts of your voicemail are now provided by Google’s free transcription service. %s + </string> + <string name="dialer_terms_and_conditions_for_verizon_1.0"> See and listen to your messages, without having to call voicemail. </string> <string name="dialer_terms_and_conditions_learn_more">Learn more</string> - - <!-- TODO(mdooley): STOP SHIP, get real url, b/65734734 --> - <string translatable="false" name="dialer_terms_and_conditions_learn_more_url">https://www.google.com</string> + <string translatable="false" name="dialer_terms_and_conditions_learn_more_url">https://support.google.com/phoneapp/answer/2811844?hl=en%26ref_topic=7539039</string> <string translatable="false" name="verizon_terms_and_conditions_policy_url">http://www.verizon.com/about/privacy/policy/</string> @@ -194,11 +198,16 @@ Si no acepta todos estos términos y condiciones, no use el buzón de voz visual <string translatable="false" name="dialer_terms_and_conditions_decline_english">No Thanks</string> <string translatable="false" name="dialer_terms_and_conditions_decline_spanish">Rechazar</string> + <string name="dialer_terms_and_conditions_existing_user_ack">Ok, got it</string> + <string name="dialer_terms_and_conditions_existing_user_setings">Settings</string> + + <string name="terms_and_conditions_decline_dialog_title">Disable visual voicemail?</string> + <string name="verizon_terms_and_conditions_decline_dialog_message">Visual voicemail will be disabled if the terms and conditions are declined.</string> - <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Disable visual voicemail</string> + <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Disable</string> - <string name="dialer_terms_and_conditions_decline_dialog_message">Visual voicemail will be disabled if the terms and conditions are declined.</string> - <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Disable visual voicemail</string> + <string name="dialer_terms_and_conditions_decline_dialog_message">Visual voicemail will be disabled if you turn off visual voicemail.</string> + <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Disable</string> <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Voicemail will only be accessible by calling *86. Set a new voicemail PIN to proceed.</string> <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Set PIN</string> diff --git a/java/com/android/dialer/app/voicemail/error/res/values/styles.xml b/java/com/android/dialer/app/voicemail/error/res/values/styles.xml index 938c77a01..bf70240b6 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values/styles.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values/styles.xml @@ -20,32 +20,32 @@ <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">48dp</item> <item name="android:gravity">end|center_vertical</item> - <item name="android:paddingStart">8dp</item> - <item name="android:paddingEnd">8dp</item> <item name="android:layout_marginStart">8dp</item> <item name="android:layout_marginEnd">8dp</item> + <item name="android:padding">8dp</item> <item name="android:textColor">@color/dialer_theme_color</item> <item name="android:fontFamily">"sans-serif-medium"</item> <item name="android:focusable">true</item> <item name="android:singleLine">true</item> <item name="android:textAllCaps">true</item> <item name="android:textSize">14sp</item> + <item name="android:minHeight">48dp</item> </style> <style name="ErrorActionDeclineStyle"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">48dp</item> <item name="android:gravity">end|center_vertical</item> - <item name="android:paddingStart">8dp</item> - <item name="android:paddingEnd">8dp</item> <item name="android:layout_marginStart">8dp</item> <item name="android:layout_marginEnd">8dp</item> - <item name="android:textColor">#80000000</item> + <item name="android:padding">8dp</item> + <item name="android:textColor">#757575</item> <item name="android:fontFamily">"sans-serif-medium"</item> <item name="android:focusable">true</item> <item name="android:singleLine">true</item> <item name="android:textAllCaps">true</item> <item name="android:textSize">14sp</item> + <item name="android:minHeight">48dp</item> </style> <style name="RaisedErrorActionStyle" parent="Widget.AppCompat.Button.Colored"> |