Rewrite speed dial feature.

Change-Id: I346bcf4552cdf2ddfd3c9b1219bc07c20332d1a2

4 files changed, 73 insertions, 5 deletions

diff --git a/res/layout/speed_dial_item.xml b/res/layout/speed_dial_item.xml
new file mode 100755
index 000000000..53807db14
--- /dev/null
+++ b/res/layout/speed_dial_item.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The CyanogenMod 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="wrap_content"
+    android:paddingStart="8dip"
+    android:paddingEnd="8dip"
+    android:orientation="horizontal"
+    android:minHeight="?android:attr/listPreferredItemHeight">
+
+    <TextView
+        android:id="@+id/index"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="12dp"
+        android:textStyle="bold"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:id="@+id/number"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+    <QuickContactBadge
+        android:id="@+id/photo"
+        android:layout_width="@dimen/speed_dial_list_contact_photo_size"
+        android:layout_height="@dimen/speed_dial_list_contact_photo_size"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="8dp" />
+
+</LinearLayout>
+
diff --git a/res/menu/dialpad_options.xml b/res/menu/dialpad_options.xml
index 0bbcecbd2..1ac7998d5 100644
--- a/res/menu/dialpad_options.xml
+++ b/res/menu/dialpad_options.xml
@@ -49,4 +49,9 @@
         android:showAsAction="withText"
         android:orderInCategory="1" />
 <!-- add for CSVT -->
+    <item
+        android:id="@+id/speed_dial"
+        android:title="@string/speed_dial_settings"
+        android:showAsAction="withText"
+        android:orderInCategory="1" />
 </menu>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 2ed5b7225..84625e956 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -73,18 +73,16 @@
     <string name="description_videocall">Video call <xliff:g id="name">%1$s</xliff:g></string>
 
     <!--  for speed dial -->
-    <string name="set_speed_dial">Speed dial settings</string>
+    <string name="speed_dial_settings">Speed dial settings</string>
     <string name="speed_dial_not_set">(not set)</string>
     <string name="speed_dial_replace">Replace</string>
     <string name="speed_dial_delete">Delete</string>
-    <string name="speed_call">Call</string>
-    <string name="speed_sms">Message</string>
-    <string name="speed_item" translatable="false">&lt;b&gt;<xliff:g id="index">%s</xliff:g>&lt;/b&gt; <xliff:g id="content">%s</xliff:g></string>
     <string name="speed_dial_unassigned_dialog_title">Key unassigned</string>
     <string name="speed_dial_unassigned_dialog_message">No speed dial action is assigned to number key \'<xliff:g id="number">%s</xliff:g>\'. Do you want to assign an action now?</string>
     <string name="dialog_speed_dial_airplane_mode_message" >"To use speed dial, first turn off Airplane mode."</string>
-    <string name="speed_dial_assign_failure_toast">The number \'<xliff:g id="number">%s</xliff:g>\' is already assigned to different speed dial key</string>
     <string name="msim_ime_dialog_title">Device identifier</string>
     <string name="multi_sim_slot_name">SIM <xliff:g id="index">%d</xliff:g></string>
     <string name="call_log_show_all_slots">All SIMs</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fe7658a72..35ff8694e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -133,4 +133,6 @@
 
     <!-- Size of the pie chart in the call stats detail activity -->
     <dimen name="call_stats_details_chart_size">140dip</dimen>
+
+    <dimen name="speed_dial_list_contact_photo_size">40dp</dimen>
 </resources>