Merge "Add dialog for SIM card select option on dialer menus"
diff --git a/res-common/layout/default_sim_checkbox.xml b/res-common/layout/default_sim_checkbox.xml
new file mode 100644
index 0000000..a0c4a9a
--- /dev/null
+++ b/res-common/layout/default_sim_checkbox.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/default_sim_checkbox_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dip"
+ android:orientation="vertical">
+ <!-- Dummy to enable right-justification of checkbox -->
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+ <CheckBox
+ android:id="@+id/default_sim_checkbox_view"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="20dip"
+ android:layout_marginLeft="20dip"
+ android:layout_marginBottom="20dip"
+ android:gravity="center"
+ android:textSize="14sp"
+ android:textAlignment="viewStart"
+ android:text="@string/set_default_sim"/>
+</LinearLayout>
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index 095157f..afbb4d6 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -123,6 +123,9 @@
scratch.
</string>
+ <!-- Label for the check box to toggle default sim card setting [CHAR LIMIT=35]-->
+ <string name="set_default_sim">Always use this SIM for calls</string>
+
<!-- Title of the "Clearing frequently contacted" progress-dialog [CHAR LIMIT=35] -->
<string name="clearFrequentsProgress_title">Clearing frequently contacted\u2026</string>
@@ -699,6 +702,9 @@
<!-- The menu item to clear frequents [CHAR LIMIT=30] -->
<string name="menu_clear_frequents">Clear frequents</string>
+ <!-- Menu item to select SIM card -->
+ <string name="menu_select_sim">Select SIM card</string>
+
<!-- The menu item to open the list of accounts -->
<string name="menu_accounts">Accounts</string>