diff options
Diffstat (limited to 'java/com/android/dialer/voicemail/listui/res')
7 files changed, 190 insertions, 8 deletions
diff --git a/java/com/android/dialer/voicemail/listui/res/drawable/shadow.xml b/java/com/android/dialer/voicemail/listui/res/drawable/shadow.xml new file mode 100644 index 000000000..925c8d290 --- /dev/null +++ b/java/com/android/dialer/voicemail/listui/res/drawable/shadow.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <gradient + android:startColor="#3333" + android:endColor="#0333" + android:type="linear" + android:angle="90"> + </gradient> +</shape> diff --git a/java/com/android/dialer/voicemail/listui/res/drawable/voicemail_tos_image.png b/java/com/android/dialer/voicemail/listui/res/drawable/voicemail_tos_image.png Binary files differnew file mode 100644 index 000000000..48ab3c3c3 --- /dev/null +++ b/java/com/android/dialer/voicemail/listui/res/drawable/voicemail_tos_image.png diff --git a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml index f35ce4dc0..c3d885968 100644 --- a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml +++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml @@ -15,9 +15,20 @@ ~ limitations under the License --> -<android.support.v7.widget.RecyclerView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/new_voicemail_call_log_recycler_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/background_dialer_light"/>
\ No newline at end of file + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:fab="http://schemas.android.com/apk/res-auto" + android:id="@+id/fragment_my_frame_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical"> + <include layout="@layout/voicemail_tos_fragment"/> + + <android.support.v7.widget.RecyclerView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/new_voicemail_call_log_recycler_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/background_dialer_light"/> + +</FrameLayout> diff --git a/java/com/android/dialer/voicemail/listui/res/layout/voicemail_tos_fragment.xml b/java/com/android/dialer/voicemail/listui/res/layout/voicemail_tos_fragment.xml new file mode 100644 index 000000000..dea41e76e --- /dev/null +++ b/java/com/android/dialer/voicemail/listui/res/layout/voicemail_tos_fragment.xml @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <ScrollView + android:id="@+id/voicemail_tos_message" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:orientation="vertical"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="32dp" + android:orientation="vertical"> + <ImageView + android:id="@+id/voicemail_image" + android:layout_width="@dimen/voicemail_tos_image_size" + android:layout_height="@dimen/voicemail_tos_image_size" + android:layout_gravity="center" + android:paddingBottom="32dp" + android:importantForAccessibility="no"/> + <TextView + android:id="@+id/tos_message_title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal|top" + android:minHeight="20dp" + android:text="@string/verizon_terms_and_conditions_title" + style="@style/TosTitleStyle"/> + <TextView + android:id="@+id/tos_message_details" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:text="@string/verizon_terms_and_conditions_1.1_english" + style="@style/TosTextStyle"/> + </LinearLayout> + </ScrollView> + + <View + android:layout_width="match_parent" + android:layout_height="0.5dp" + android:elevation="1dp" + android:background="@drawable/shadow"/> + + <LinearLayout + android:id="@+id/voicemail_tos_button" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:minHeight="56dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:paddingTop="10dp" + android:paddingBottom="10dp" + android:background="#ffffffff" + android:orientation="horizontal"> + <Button + android:id="@+id/voicemail_tos_button_decline" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/verizon_terms_and_conditions_decline_english" + android:textColor="#757575" + style="@style/TosButtonStyle"/> + + <android.support.v4.widget.Space + android:layout_width="8dp" + android:layout_height="match_parent" + android:layout_weight="1"/> + + + <Button + android:id="@+id/voicemail_tos_button_accept" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/verizon_terms_and_conditions_accept_english" + android:textColor="@color/dialer_theme_color" + style="@style/TosButtonStyle"/> + + </LinearLayout> + +</LinearLayout> diff --git a/java/com/android/dialer/voicemail/listui/res/values/dimens.xml b/java/com/android/dialer/voicemail/listui/res/values/dimens.xml index 52fad4917..59da7f288 100644 --- a/java/com/android/dialer/voicemail/listui/res/values/dimens.xml +++ b/java/com/android/dialer/voicemail/listui/res/values/dimens.xml @@ -38,4 +38,7 @@ <dimen name="voicemail_media_player_width">0dp</dimen> <dimen name="voicemail_header_margin_start">16dp</dimen> + + <dimen name="voicemail_tos_image_size">280dp</dimen> + </resources> diff --git a/java/com/android/dialer/voicemail/listui/res/values/strings.xml b/java/com/android/dialer/voicemail/listui/res/values/strings.xml index 53c525279..70a5d03df 100644 --- a/java/com/android/dialer/voicemail/listui/res/values/strings.xml +++ b/java/com/android/dialer/voicemail/listui/res/values/strings.xml @@ -34,4 +34,23 @@ <!-- Header in voicemail tab to group calls from before the current day. [CHAR LIMIT=30] --> <string name="new_voicemail_header_older">Older</string> -</resources>
\ No newline at end of file + <string name="verizon_terms_and_conditions_title" translatable="false">Turn on visual voicemail</string> + + <string translatable="false" name="verizon_terms_and_conditions_1.1_english"> +Visual Voice Mail (VVM) is a service that provides access to voice mail messages directly on the device, without the need to call *86. This service requires traditional Voice Mail but does not support all traditional Voice Mail features, which you can access by dialing *86 from your handset. Use of this feature will be billed on a per-megabyte basis, or according to any data package you have. Mobile to mobile minutes do not apply. Standard rates apply to any calls, emails or messages initiated from Visual Voice Mail.\n +\n +You may disable VVM in settings. This will revert you to basic voice mail. In some cases you may need to call customer care to cancel and if you cancel Visual Voice Mail you may lose all stored voice mails and information.\n +\n +For the Premium Visual Voice Mail service, some voice messages may not be completely transcribed; incomplete messages will end with [...]. Only the first 45 seconds of each voice message will be transcribed, so for longer messages, you will need to listen to the voice message itself. Any profane or offensive language also will not be transcribed and will appear as [...] in the transcription.\n +\n +Speech recordings may be collected and stored for a period of 30 days, solely for the purpose of testing and improving transcription technology and performance, subject to the Verizon Wireless Privacy Policy, which can be found at <xliff:g>%s</xliff:g>\n +\n +You understand that by selecting ACCEPT, your messages will be stored and anyone in possession of this device will have access to your voice mail. You further understand that your voice mail messages may be stored in electronic format on this device. To limit unauthorized access to your voice mail, you should consider locking your phone when not in use. Not available in all areas or over Wi\u2011Fi.\n +\n +If you do not accept all of these terms and conditions, do not use Visual Voice Mail. </string> + + <string translatable="false" name="verizon_terms_and_conditions_decline_english">No Thanks</string> + + <string translatable="false" name="verizon_terms_and_conditions_accept_english">Turn On</string> + +</resources> diff --git a/java/com/android/dialer/voicemail/listui/res/values/styles.xml b/java/com/android/dialer/voicemail/listui/res/values/styles.xml index aec46090a..386992788 100644 --- a/java/com/android/dialer/voicemail/listui/res/values/styles.xml +++ b/java/com/android/dialer/voicemail/listui/res/values/styles.xml @@ -22,4 +22,26 @@ <item name="android:layout_height">@dimen/voicemail_media_player_height</item> <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item> </style> -</resources>
\ No newline at end of file + + <style name="TosTitleStyle"> + <item name="android:textColor">@color/primary_text_color</item> + <item name="android:textSize">20sp</item> + <item name="android:fontFamily">"sans-serif-medium"</item> + </style> + + <style name="TosTextStyle"> + <item name="android:textSize">16sp</item> + <item name="android:textColor">@color/dialer_primary_text_color</item> + <item name="android:fontFamily">"sans-serif-regular"</item> + <item name="android:lineSpacingExtra">8sp</item> + </style> + + <style name="TosButtonStyle" parent="Widget.AppCompat.Button.Borderless"> + <item name="android:gravity">end|center_vertical</item> + <item name="android:layout_marginStart">8dp</item> + <item name="android:layout_marginEnd">8dp</item> + <item name="android:padding">8dp</item> + <item name="android:minHeight">48dp</item> + </style> + +</resources> |