Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'

Change-Id: I6c9de433a224925961b484b400a89edf9059d2bd

1 files changed, 34 insertions, 0 deletions

diff --git a/res/xml/wifi_calling_settings.xml b/res/xml/wifi_calling_settings.xml
new file mode 100644
index 000000000..37a2d285b
--- /dev/null
+++ b/res/xml/wifi_calling_settings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:key="wifi_calling_settings"
+                  android:title="@string/wifi_calling_settings_title">
+
+    <ListPreference
+            android:key="wifi_calling_mode"
+            android:title="@string/wifi_calling_mode_title"
+            android:summary="@string/wifi_calling_mode_title"
+            android:entries="@array/wifi_calling_mode_choices"
+            android:entryValues="@array/wifi_calling_mode_values"
+            android:dialogTitle="@string/wifi_calling_mode_dialog_title" />
+
+    <SwitchPreference
+            android:key="wifi_calling_roam"
+            android:title="@string/wifi_calling_roam_title"
+            android:persistent="false"/>
+
+</PreferenceScreen>