diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-07 02:20:21 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-07 02:20:21 +0000 |
commit | 28b252f6e0e4d42551a31d1b197f2eedf7b6a7d5 (patch) | |
tree | 454b1b7cfa72d077b125d9351a8a2fdd0272fd75 /java/com/android/incallui/video/impl/res | |
parent | d554f435556b21e667d86b7ce9da67445a98ee5b (diff) | |
parent | da410d32f17dd823dba772181271ff55ee8e3eaf (diff) |
Merge "Show a warning dialog about charges when user starts a video call"
Diffstat (limited to 'java/com/android/incallui/video/impl/res')
-rw-r--r-- | java/com/android/incallui/video/impl/res/layout/frag_video_charges_alert_dialog.xml | 51 | ||||
-rw-r--r-- | java/com/android/incallui/video/impl/res/values/strings.xml | 6 |
2 files changed, 57 insertions, 0 deletions
diff --git a/java/com/android/incallui/video/impl/res/layout/frag_video_charges_alert_dialog.xml b/java/com/android/incallui/video/impl/res/layout/frag_video_charges_alert_dialog.xml new file mode 100644 index 000000000..a547c7d69 --- /dev/null +++ b/java/com/android/incallui/video/impl/res/layout/frag_video_charges_alert_dialog.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2018 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. +--> +<ScrollView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="24dp" + android:paddingStart="24dp" + android:paddingEnd="24dp" + android:paddingBottom="4dp" + android:orientation="vertical"> + + <TextView + android:id="@+id/message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="10dp" + android:text="@string/videocall_charges_alert_dialog_description" + android:textColor="@color/dialer_primary_text_color" + android:textSize="16sp"/> + + <CheckBox + android:id="@+id/do_not_show" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:buttonTint="@color/dialer_theme_color" + android:focusable="true" + android:clickable="true" + android:text="@string/do_not_show_again" + android:textColor="@color/dialer_primary_text_color" + android:textSize="14sp"/> + </LinearLayout> +</ScrollView>
\ No newline at end of file diff --git a/java/com/android/incallui/video/impl/res/values/strings.xml b/java/com/android/incallui/video/impl/res/values/strings.xml index 58ea8bde7..6c90af5f3 100644 --- a/java/com/android/incallui/video/impl/res/values/strings.xml +++ b/java/com/android/incallui/video/impl/res/values/strings.xml @@ -29,4 +29,10 @@ <!-- Text indicates the call is resumed from held by remote party. [CHAR LIMIT=20] --> <string name="videocall_remotely_resumed">Call resumed</string> + <!-- Instruction text to notify user that charges may apply on video calling. [CHAR LIMIT=NONE] --> + <string name="videocall_charges_alert_dialog_description">Video calls made over the mobile network use both data and voice minutes. Charges may apply.</string> + + <!-- Option to hide the popup dialog if it is not necessary for the user. [CHAR LIMIT=40] --> + <string name="do_not_show_again">Do not show again</string> + </resources> |