Merge "Update Dialer to v10 RC32" into oc-dev

am: 0c9dbf507b

Change-Id: I5f90090090c6e430d83fcdd294082c1f5237ade8

1 files changed, 43 insertions, 0 deletions

diff --git a/java/com/android/incallui/telecomeventui/res/layout/frag_international_call_on_wifi_dialog.xml b/java/com/android/incallui/telecomeventui/res/layout/frag_international_call_on_wifi_dialog.xml
new file mode 100644
index 000000000..3d8adcb0d
--- /dev/null
+++ b/java/com/android/incallui/telecomeventui/res/layout/frag_international_call_on_wifi_dialog.xml
@@ -0,0 +1,43 @@
+<?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="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingTop="25dp"
+    android:paddingStart="25dp"
+    android:paddingEnd="25dp"
+    android:paddingBottom="4dp"
+    android:orientation="vertical">
+
+  <TextView
+      android:id="@+id/details"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginBottom="10dp"
+      android:text="@string/details"
+      android:textColor="@color/dialer_primary_text_color"
+      android:textSize="16sp"/>
+
+  <CheckBox
+      android:id="@+id/always_warn"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:buttonTint="@color/dialer_theme_color"
+      android:text="@string/always_warn"
+      android:textColor="@color/dialer_primary_text_color"
+      android:textSize="14sp"/>
+</LinearLayout>
+