Rewrite speed dial feature.

Change-Id: I346bcf4552cdf2ddfd3c9b1219bc07c20332d1a2

5 files changed, 86 insertions, 26 deletions

diff --git a/res/layout/speed_dial_item.xml b/res/layout/speed_dial_item.xml
new file mode 100755
index 000000000..8140fcb3a
--- /dev/null
+++ b/res/layout/speed_dial_item.xml
@@ -0,0 +1,62 @@
+<?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="16dip"
+    android:paddingEnd="16dip"
+    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_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/contact_photo_size"
+        android:layout_height="@dimen/contact_photo_size"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="8dp" />
+
+</LinearLayout>
+
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 623cadf4b..c40e03431 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -209,18 +209,6 @@
     <string name="device_id">设备标识符</string>
     <string name="menu_4g_conference_call">4G会议电话</string>
 
-    <!--  for speed dial -->
-    <string name="set_speed_dial">快速拨号设置</string>
-    <string name="dialog_title">提示</string>
-    <string name="not_set">(未设置)</string>
-    <string name="replace">替换</string>
-    <string name="delete">删除</string>
-    <string name="speed_call">通话</string>
-    <string name="speed_sms">信息</string>
-    <string name="is_set_speed">数字键<xliff:g id="number">%s</xliff:g>未设置快速拨号，是否设置？\n</string>
-    <string name="dialog_speed_dial_airplane_mode_message" >"要呼叫快速拨号，请先关闭飞行模式。"</string>
-    <string name="assignSpeedDialFailToast">此号码已分配了快速拨号键，请选择其它号码。</string>
-
     <string name="call_log_show_all_slots">"所有卡"</string>
     <string name="call_log_all_calls_header">"所有通话"</string>
     <string name="calllog_search_hint">"搜索通话记录"</string>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index f41275ed9..494d85b94 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -60,4 +60,15 @@
 
     <string name="menu_add_to_blacklist">Add to blacklist</string>
     <string name="toast_added_to_blacklist">%s added to blacklist.</string>
+
+    <!--  for speed dial -->
+    <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_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="yes">Yes</string>
+    <string name="no">No</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e0ca55aeb..ede58cba2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -822,19 +822,6 @@
 
     <string name="device_id">Device Identifier</string>
 
-    <!--  for speed dial -->
-    <string name="set_speed_dial">Speed dial settings</string>
-    <string name="dialog_title">Tip</string>
-    <string name="not_set">(not set)</string>
-    <string name="replace">Replace</string>
-    <string name="delete">Delete</string>
-    <string name="speed_call">Call</string>
-    <string name="speed_sms">Message</string>
-    <string name="speed_item"><xliff:g id="index">%s</xliff:g>. <xliff:g id="content">%s</xliff:g></string>
-    <string name="is_set_speed">Number key <xliff:g id="number">%s</xliff:g> is not set up speed dial, set now?\n</string>
-    <string name="dialog_speed_dial_airplane_mode_message" >"To call Speed dial, first turn off Airplane mode."</string>
-    <string name="assignSpeedDialFailToast">The number has already been assigned to a speed dial key, please select another number.</string>
-
     <string name="call_log_show_all_slots">All SIMs</string>
     <string name="call_log_all_calls_header">All calls</string>
     <string name="calllog_search_hint">"Search call log"</string>
diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml
index aa8613dd1..454f606cf 100755
--- a/res/xml/general_settings.xml
+++ b/res/xml/general_settings.xml
@@ -71,6 +71,18 @@
 
         </PreferenceScreen>
 
+        <PreferenceScreen
+            android:key="speed_dial_settings"
+            android:title="@string/speed_dial_settings"
+            android:persistent="false">
+
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.dialer"
+                android:targetClass="com.android.dialer.SpeedDialListActivity" />
+
+        </PreferenceScreen>
+
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>