Merge commit '46bf6237bd2a3a4f039569db3208193b9424b1a0' into HEAD

Conflicts:
	src/com/android/dialer/calllog/CallLogQueryHandler.java
	src/com/android/dialer/database/DialerDatabaseHelper.java

Change-Id: I51c609107825307d0b83ef22ce7454126f2ef4ff

51 files changed, 1175 insertions, 31 deletions

diff --git a/res/color/setting_primary_color.xml b/res/color/setting_primary_color.xml
new file mode 100644
index 000000000..6d083e2f9
--- /dev/null
+++ b/res/color/setting_primary_color.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+          android:alpha="0.26"
+          android:color="@color/dialtacts_primary_text_color"/>
+    <item android:color="@color/dialtacts_primary_text_color"/>
+</selector>
diff --git a/res/color/setting_secondary_color.xml b/res/color/setting_secondary_color.xml
new file mode 100644
index 000000000..9ebbc4e42
--- /dev/null
+++ b/res/color/setting_secondary_color.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+          android:alpha="0.26"
+          android:color="@color/dialtacts_secondary_text_color"/>
+    <item android:color="@color/dialtacts_secondary_text_color"/>
+</selector>
diff --git a/res/drawable-hdpi/ic_call_inout_holo_dark.png b/res/drawable-hdpi/ic_call_inout_holo_dark.png
new file mode 100644
index 000000000..1dbf4b485
--- /dev/null
+++ b/res/drawable-hdpi/ic_call_inout_holo_dark.png
diff --git a/res/drawable-hdpi/ic_places_picture_180_holo_light.png b/res/drawable-hdpi/ic_places_picture_180_holo_light.png
new file mode 100644
index 000000000..f0bbe7345
--- /dev/null
+++ b/res/drawable-hdpi/ic_places_picture_180_holo_light.png
diff --git a/res/drawable-hdpi/ic_places_picture_holo_light.png b/res/drawable-hdpi/ic_places_picture_holo_light.png
new file mode 100644
index 000000000..f70e8e711
--- /dev/null
+++ b/res/drawable-hdpi/ic_places_picture_holo_light.png
diff --git a/res/drawable-hdpi/spinner_default_holo_dark.9.png b/res/drawable-hdpi/spinner_default_holo_dark.9.png
new file mode 100644
index 000000000..78e583ce2
--- /dev/null
+++ b/res/drawable-hdpi/spinner_default_holo_dark.9.png
diff --git a/res/drawable-hdpi/spinner_disabled_holo_dark.9.png b/res/drawable-hdpi/spinner_disabled_holo_dark.9.png
new file mode 100644
index 000000000..210832cd3
--- /dev/null
+++ b/res/drawable-hdpi/spinner_disabled_holo_dark.9.png
diff --git a/res/drawable-hdpi/spinner_focused_holo_dark.9.png b/res/drawable-hdpi/spinner_focused_holo_dark.9.png
new file mode 100644
index 000000000..5135f2ba6
--- /dev/null
+++ b/res/drawable-hdpi/spinner_focused_holo_dark.9.png
diff --git a/res/drawable-hdpi/spinner_pressed_holo_dark.9.png b/res/drawable-hdpi/spinner_pressed_holo_dark.9.png
new file mode 100644
index 000000000..aca943565
--- /dev/null
+++ b/res/drawable-hdpi/spinner_pressed_holo_dark.9.png
diff --git a/res/drawable-mdpi/ic_call_inout_holo_dark.png b/res/drawable-mdpi/ic_call_inout_holo_dark.png
new file mode 100644
index 000000000..88b92a195
--- /dev/null
+++ b/res/drawable-mdpi/ic_call_inout_holo_dark.png
diff --git a/res/drawable-mdpi/spinner_default_holo_dark.9.png b/res/drawable-mdpi/spinner_default_holo_dark.9.png
new file mode 100644
index 000000000..5ac84dd14
--- /dev/null
+++ b/res/drawable-mdpi/spinner_default_holo_dark.9.png
diff --git a/res/drawable-mdpi/spinner_disabled_holo_dark.9.png b/res/drawable-mdpi/spinner_disabled_holo_dark.9.png
new file mode 100644
index 000000000..2734f20bf
--- /dev/null
+++ b/res/drawable-mdpi/spinner_disabled_holo_dark.9.png
diff --git a/res/drawable-mdpi/spinner_focused_holo_dark.9.png b/res/drawable-mdpi/spinner_focused_holo_dark.9.png
new file mode 100644
index 000000000..392c72ff8
--- /dev/null
+++ b/res/drawable-mdpi/spinner_focused_holo_dark.9.png
diff --git a/res/drawable-mdpi/spinner_pressed_holo_dark.9.png b/res/drawable-mdpi/spinner_pressed_holo_dark.9.png
new file mode 100644
index 000000000..75fb81e3a
--- /dev/null
+++ b/res/drawable-mdpi/spinner_pressed_holo_dark.9.png
diff --git a/res/drawable-xhdpi/ic_call_inout_holo_dark.png b/res/drawable-xhdpi/ic_call_inout_holo_dark.png
new file mode 100644
index 000000000..f133f164c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_call_inout_holo_dark.png
diff --git a/res/drawable-xhdpi/ic_places_picture_180_holo_light.png b/res/drawable-xhdpi/ic_places_picture_180_holo_light.png
new file mode 100644
index 000000000..6409ab185
--- /dev/null
+++ b/res/drawable-xhdpi/ic_places_picture_180_holo_light.png
diff --git a/res/drawable-xhdpi/ic_places_picture_holo_light.png b/res/drawable-xhdpi/ic_places_picture_holo_light.png
new file mode 100644
index 000000000..7c92a6030
--- /dev/null
+++ b/res/drawable-xhdpi/ic_places_picture_holo_light.png
diff --git a/res/drawable-xhdpi/spinner_default_holo_dark.9.png b/res/drawable-xhdpi/spinner_default_holo_dark.9.png
new file mode 100644
index 000000000..fadfb5d01
--- /dev/null
+++ b/res/drawable-xhdpi/spinner_default_holo_dark.9.png
diff --git a/res/drawable-xhdpi/spinner_disabled_holo_dark.9.png b/res/drawable-xhdpi/spinner_disabled_holo_dark.9.png
new file mode 100644
index 000000000..7c3c49baf
--- /dev/null
+++ b/res/drawable-xhdpi/spinner_disabled_holo_dark.9.png
diff --git a/res/drawable-xhdpi/spinner_focused_holo_dark.9.png b/res/drawable-xhdpi/spinner_focused_holo_dark.9.png
new file mode 100644
index 000000000..fdb0d5daa
--- /dev/null
+++ b/res/drawable-xhdpi/spinner_focused_holo_dark.9.png
diff --git a/res/drawable-xhdpi/spinner_pressed_holo_dark.9.png b/res/drawable-xhdpi/spinner_pressed_holo_dark.9.png
new file mode 100644
index 000000000..2023a9d1b
--- /dev/null
+++ b/res/drawable-xhdpi/spinner_pressed_holo_dark.9.png
diff --git a/res/drawable-xxhdpi/ic_places_picture_180_holo_light.png b/res/drawable-xxhdpi/ic_places_picture_180_holo_light.png
new file mode 100644
index 000000000..97b982257
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_places_picture_180_holo_light.png
diff --git a/res/drawable-xxhdpi/ic_places_picture_holo_light.png b/res/drawable-xxhdpi/ic_places_picture_holo_light.png
new file mode 100644
index 000000000..43029bd81
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_places_picture_holo_light.png
diff --git a/res/drawable-xxhdpi/spinner_default_holo_dark.9.png b/res/drawable-xxhdpi/spinner_default_holo_dark.9.png
new file mode 100644
index 000000000..b0020f25f
--- /dev/null
+++ b/res/drawable-xxhdpi/spinner_default_holo_dark.9.png
diff --git a/res/drawable-xxhdpi/spinner_disabled_holo_dark.9.png b/res/drawable-xxhdpi/spinner_disabled_holo_dark.9.png
new file mode 100644
index 000000000..7c1209687
--- /dev/null
+++ b/res/drawable-xxhdpi/spinner_disabled_holo_dark.9.png
diff --git a/res/drawable-xxhdpi/spinner_focused_holo_dark.9.png b/res/drawable-xxhdpi/spinner_focused_holo_dark.9.png
new file mode 100644
index 000000000..41bb295fc
--- /dev/null
+++ b/res/drawable-xxhdpi/spinner_focused_holo_dark.9.png
diff --git a/res/drawable-xxhdpi/spinner_pressed_holo_dark.9.png b/res/drawable-xxhdpi/spinner_pressed_holo_dark.9.png
new file mode 100644
index 000000000..e2212a5e6
--- /dev/null
+++ b/res/drawable-xxhdpi/spinner_pressed_holo_dark.9.png
diff --git a/res/drawable/spinner_ab_holo_dark.xml b/res/drawable/spinner_ab_holo_dark.xml
new file mode 100644
index 000000000..a8baaa115
--- /dev/null
+++ b/res/drawable/spinner_ab_holo_dark.xml
@@ -0,0 +1,31 @@
+<?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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true">
+
+    <item android:state_enabled="false"
+        android:drawable="@drawable/spinner_disabled_holo_dark" />
+
+    <item android:state_pressed="true"
+        android:drawable="@drawable/spinner_pressed_holo_dark" />
+
+    <item android:state_pressed="false"
+        android:state_focused="true"
+        android:drawable="@drawable/spinner_focused_holo_dark" />
+
+    <item android:drawable="@drawable/spinner_default_holo_dark" />
+</selector>
diff --git a/res/layout/call_stats_detail.xml b/res/layout/call_stats_detail.xml
new file mode 100644
index 000000000..c24211afa
--- /dev/null
+++ b/res/layout/call_stats_detail.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2009 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:id="@+id/call_stats_detail"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:layout_alignParentStart="true"
+    android:layout_alignParentTop="true"
+    android:background="@color/background_dialer_details_list_items" >
+
+    <!-- Caller information "card" -->
+    <LinearLayout
+        android:id="@+id/caller_information"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/call_detail_horizontal_margin"
+        android:paddingTop="@dimen/call_detail_top_margin"
+        android:paddingBottom="@dimen/call_detail_bottom_margin"
+        android:baselineAligned="false"
+        android:orientation="horizontal"
+        android:translationZ="@dimen/call_detail_translation_z"
+        android:focusable="true"
+        android:background="@color/background_dialer_white" >
+
+        <QuickContactBadge
+            android:id="@+id/quick_contact_photo"
+            android:layout_width="@dimen/contact_photo_size"
+            android:layout_height="@dimen/contact_photo_size"
+            android:layout_alignParentStart="true"
+            android:layout_gravity="top"
+            android:layout_marginTop="3dp"
+            android:focusable="true"
+            />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="center_vertical"
+            android:layout_marginStart="@dimen/call_detail_horizontal_margin"
+            >
+            <TextView
+                android:id="@+id/caller_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/call_log_primary_text_color"
+                android:textSize="@dimen/call_log_primary_text_size"
+                android:includeFontPadding="false"
+                android:layout_marginBottom="5dp"
+                android:singleLine="true"
+                />
+            <TextView
+                android:id="@+id/caller_number"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/call_log_secondary_text_color"
+                android:textSize="@dimen/call_log_secondary_text_size"
+                android:layout_marginBottom="1dp"
+                android:singleLine="true"
+                />
+            <TextView
+                android:id="@+id/phone_account_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/call_log_secondary_text_color"
+                android:textSize="@dimen/call_log_secondary_text_size"
+                android:singleLine="true"
+                android:visibility="gone"
+                />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/header_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="?attr/call_log_header_color" />
+
+    <!-- The actual details -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include layout="@layout/call_stats_detail_info" />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/call_stats_detail_info.xml b/res/layout/call_stats_detail_info.xml
new file mode 100644
index 000000000..7dcd06dfe
--- /dev/null
+++ b/res/layout/call_stats_detail_info.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2011 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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/call_stats_info"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/call_detail_horizontal_margin"
+    android:paddingEnd="@dimen/call_log_outer_margin"
+    android:paddingTop="@dimen/call_log_inner_margin"
+    android:paddingBottom="@dimen/call_log_inner_margin">
+
+    <TextView
+        android:id="@+id/date_filter"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:layout_marginBottom="@dimen/call_log_icon_margin"
+        android:textColor="@color/secondary_text_color" />
+
+    <LinearLayout
+        android:id="@+id/total_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/call_log_icon_margin"
+        android:layout_below="@id/date_filter" >
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:src="@drawable/ic_call_inout_holo_dark" />
+
+        <TextView
+            android:id="@+id/total_summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_below="@id/date_filter"
+            android:layout_marginStart="@dimen/call_log_icon_margin"
+            android:textColor="?attr/call_log_primary_text_color"
+            android:textSize="@dimen/call_log_primary_text_size" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/total_duration"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/total_container"
+        android:layout_marginBottom="@dimen/call_log_inner_margin"
+        android:textColor="?attr/call_log_secondary_text_color"
+        android:textSize="@dimen/call_log_secondary_text_size" />
+
+    <com.android.dialer.widget.PieChartView
+        android:id="@+id/pie_chart"
+        android:layout_width="@dimen/call_stats_details_chart_size"
+        android:layout_height="@dimen/call_stats_details_chart_size"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:layout_below="@id/total_duration" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_toStartOf="@id/pie_chart"
+        android:layout_below="@id/total_duration"
+        android:divider="?android:attr/dividerHorizontal"
+        android:orientation="vertical"
+        android:showDividers="middle" >
+
+        <LinearLayout
+            android:id="@+id/in_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/call_log_icon_margin"
+            android:layout_marginTop="@dimen/call_log_icon_margin"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+
+                <com.android.dialer.calllog.CallTypeIconsView
+                    android:id="@+id/in_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical" />
+
+                <TextView
+                    android:id="@+id/in_summary"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_marginStart="@dimen/call_log_icon_margin"
+                    android:textColor="?attr/call_log_primary_text_color"
+                    android:textSize="@dimen/call_log_primary_text_size" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/in_count"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/call_log_secondary_text_color"
+                android:textSize="@dimen/call_log_secondary_text_size" />
+
+            <TextView
+                android:id="@+id/in_duration"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/call_log_secondary_text_color"
+                android:textSize="@dimen/call_log_secondary_text_size" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/out_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/call_log_icon_margin"
+            android:layout_marginTop="@dimen/call_log_icon_margin"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+
+                <com.android.dialer.calllog.CallTypeIconsView
+                    android:id="@+id/out_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical" />
+
+                <TextView
+                    android:id="@+id/out_summary"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_marginStart="@dimen/call_log_icon_margin"
+					android:textColor="?attr/call_log_primary_text_color"
+                    android:textSize="@dimen/call_log_primary_text_size" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/out_count"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/call_log_secondary_text_color"
+                android:textSize="@dimen/call_log_secondary_text_size" />
+
+            <TextView
+                android:id="@+id/out_duration"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/call_log_secondary_text_color"
+                android:textSize="@dimen/call_log_secondary_text_size" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/missed_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/call_log_icon_margin"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+
+                <com.android.dialer.calllog.CallTypeIconsView
+                    android:id="@+id/missed_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical" />
+
+                <TextView
+                    android:id="@+id/missed_summary"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/call_log_icon_margin"
+                    android:textColor="?attr/call_log_primary_text_color"
+                    android:textSize="@dimen/call_log_primary_text_size" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/missed_count"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/call_log_secondary_text_color"
+                android:textSize="@dimen/call_log_secondary_text_size" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout/call_stats_filter_spinner.xml b/res/layout/call_stats_filter_spinner.xml
new file mode 100644
index 000000000..b2054e7ad
--- /dev/null
+++ b/res/layout/call_stats_filter_spinner.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    style="@style/DialtactsActionBarSpinner" />
diff --git a/res/layout/call_stats_fragment.xml b/res/layout/call_stats_fragment.xml
new file mode 100644
index 000000000..146e1f687
--- /dev/null
+++ b/res/layout/call_stats_fragment.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2011 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.
+-->
+
+<!-- Layout parameters are set programmatically. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:divider="?android:attr/dividerHorizontal"
+    android:orientation="vertical"
+    android:showDividers="end"
+    android:background="@color/background_dialer_list_items" >
+
+    <LinearLayout
+        android:id="@+id/call_stats_header"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingTop="@dimen/call_log_inner_margin"
+        android:visibility="gone" >
+
+        <TextView
+            android:id="@+id/date_filter"
+            style="@style/ContactListSeparatorTextViewStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/call_log_outer_margin"
+            android:layout_marginEnd="@dimen/call_log_outer_margin"
+            android:background="@null" />
+
+        <TextView
+            android:id="@+id/sum_header"
+            style="@style/ContactListSeparatorTextViewStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/call_log_outer_margin"
+            android:layout_marginEnd="@dimen/call_log_outer_margin"
+            android:paddingBottom="@dimen/call_log_inner_margin" />
+
+        <View
+            android:id="@+id/call_stats_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:layout_gravity="bottom"
+            android:layout_marginStart="@dimen/call_log_outer_margin"
+            android:layout_marginEnd="@dimen/call_log_outer_margin"
+            android:background="#55ffffff" />
+    </LinearLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+
+        <ListView
+            android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:divider="@null"
+            android:fadingEdge="none"
+            android:scrollbarStyle="outsideOverlay"
+            android:background="@color/background_dialer_list_items" />
+
+        <include
+            android:id="@+id/empty_list_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            layout="@layout/empty_list_view"
+            android:visibility="gone"/>
+
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/res/layout/call_stats_list_item.xml b/res/layout/call_stats_list_item.xml
new file mode 100644
index 000000000..828436520
--- /dev/null
+++ b/res/layout/call_stats_list_item.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2007 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.
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ex="http://schemas.android.com/apk/res/com.android.dialer"
+    android:id="@+id/primary_action_view"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/call_log_start_margin"
+    android:paddingEnd="@dimen/call_log_outer_margin"
+    android:paddingTop="@dimen/call_log_outer_margin"
+    android:paddingBottom="@dimen/call_log_outer_margin"
+	android:background="?android:attr/selectableItemBackground">
+
+    <QuickContactBadge
+        android:id="@+id/quick_contact_photo"
+        android:layout_width="@dimen/contact_photo_size"
+        android:layout_height="@dimen/contact_photo_size"
+        android:layout_marginEnd="@dimen/call_log_start_margin"
+        android:paddingTop="2dp" />
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/quick_contact_photo"
+        android:ellipsize="marquee"
+        android:singleLine="true"
+        android:textColor="?attr/call_log_primary_text_color"
+        android:textSize="@dimen/call_log_primary_text_size" />
+
+    <TextView
+        android:id="@+id/percent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/name"
+        android:layout_alignBaseline="@id/name"
+        android:layout_alignParentEnd="true"
+        android:gravity="end"
+        android:textColor="?attr/call_log_secondary_text_color"
+        android:textSize="@dimen/call_log_secondary_text_size" />
+
+    <com.android.dialer.widget.LinearColorBar
+        android:id="@+id/percent_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="6dp"
+        android:layout_below="@id/name"
+        android:layout_toEndOf="@id/quick_contact_photo"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/call_log_icon_margin"
+        android:layout_marginBottom="@dimen/call_log_icon_margin"
+        android:orientation="horizontal"
+        android:paddingEnd="4dp"
+        android:paddingStart="4dp"
+        ex:backgroundColor="@color/call_stats_bar_background"
+        ex:blueColor="@color/call_stats_incoming"
+        ex:greenColor="@color/call_stats_outgoing"
+        ex:redColor="@color/call_stats_missed" />
+
+    <TextView
+        android:id="@+id/number"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/percent_bar"
+        android:layout_toEndOf="@id/quick_contact_photo"
+        android:layout_marginEnd="@dimen/call_log_icon_margin"
+        android:ellipsize="marquee"
+        android:singleLine="true"
+        android:textColor="?attr/call_log_secondary_text_color"
+        android:textSize="@dimen/call_log_secondary_text_size" />
+
+    <TextView
+        android:id="@+id/label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/number"
+        android:layout_alignBaseline="@id/number"
+        android:ellipsize="marquee"
+        android:singleLine="true"
+        android:textColor="?attr/call_log_secondary_text_color"
+        android:textSize="@dimen/call_log_secondary_text_size"
+        android:textStyle="bold" />
+
+</RelativeLayout>
diff --git a/res/layout/call_stats_nav_item.xml b/res/layout/call_stats_nav_item.xml
new file mode 100644
index 000000000..0e572a7ef
--- /dev/null
+++ b/res/layout/call_stats_nav_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2011 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.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/call_stats_nav_text"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:minHeight="40dp"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:textAppearance="?android:attr/textAppearanceListItemSmall" />
+
diff --git a/res/layout/double_date_picker_dialog.xml b/res/layout/double_date_picker_dialog.xml
new file mode 100644
index 000000000..ec4a1f25b
--- /dev/null
+++ b/res/layout/double_date_picker_dialog.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2007, 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:gravity="center"
+    android:orientation="vertical" >
+
+    <Spinner
+        android:id="@+id/date_quick_selection"
+        android:layout_marginTop="3dp"
+        android:layout_marginBottom="3dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="-12dp"
+        android:layout_marginRight="3dp"
+        android:layout_marginTop="3dp"
+        android:text="@string/call_stats_filter_from"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <DatePicker
+        android:id="@+id/date_picker_from"
+        android:datePickerMode="spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:calendarViewShown="false"
+        android:spinnersShown="true" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="-12dp"
+        android:layout_marginRight="4dp"
+        android:text="@string/call_stats_filter_to"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <DatePicker
+        android:id="@+id/date_picker_to"
+        android:datePickerMode="spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:calendarViewShown="false"
+        android:spinnersShown="true" />
+
+</LinearLayout>
diff --git a/res/layout/speed_dial_item.xml b/res/layout/speed_dial_item.xml
new file mode 100755
index 000000000..948d2e707
--- /dev/null
+++ b/res/layout/speed_dial_item.xml
@@ -0,0 +1,65 @@
+<?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: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:textColor="?attr/call_log_primary_text_color"
+            android:textSize="@dimen/call_log_primary_text_size" />
+
+        <TextView
+            android:id="@+id/number"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/call_log_name_margin_bottom"
+            android:textColor="?attr/call_log_secondary_text_color"
+            android:textSize="@dimen/call_log_secondary_text_size" />
+
+    </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/menu/call_details_options.xml b/res/menu/call_details_options.xml
index fa927a9bd..f57cd1c09 100644
--- a/res/menu/call_details_options.xml
+++ b/res/menu/call_details_options.xml
@@ -51,4 +51,9 @@
         android:title="@string/recentCalls_editNumberBeforeCall"
         android:onClick="onMenuEditNumberBeforeCall"
     />
+    <item
+        android:id="@+id/menu_add_to_blacklist"
+        android:title="@string/menu_add_to_blacklist"
+        android:onClick="onMenuAddToBlacklist"
+    />
 </menu>
diff --git a/res/menu/call_stats_details_options.xml b/res/menu/call_stats_details_options.xml
new file mode 100644
index 000000000..c16db3315
--- /dev/null
+++ b/res/menu/call_stats_details_options.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_edit_number_before_call"
+        android:title="@string/recentCalls_editNumberBeforeCall"
+        android:onClick="onMenuEditNumberBeforeCall"
+    />
+    <item
+        android:id="@+id/menu_add_to_blacklist"
+        android:title="@string/menu_add_to_blacklist"
+        android:onClick="onMenuAddToBlacklist"
+    />
+</menu>
diff --git a/res/menu/call_stats_options.xml b/res/menu/call_stats_options.xml
new file mode 100644
index 000000000..3c683750e
--- /dev/null
+++ b/res/menu/call_stats_options.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2011 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.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:id="@+id/filter"
+        android:showAsAction="always"
+        android:actionLayout="@layout/call_stats_filter_spinner" />
+
+    <item
+        android:id="@+id/date_filter"
+        android:showAsAction="never"
+        android:title="@string/call_stats_date_filter"/>
+
+    <item
+        android:id="@+id/reset_date_filter"
+        android:showAsAction="never"
+        android:visible="false"
+        android:title="@string/call_stats_reset_filter"/>
+
+    <item
+        android:id="@+id/sort_by_duration"
+        android:showAsAction="never"
+        android:visible="false"
+        android:title="@string/call_stats_sort_by_duration"/>
+
+    <item
+        android:id="@+id/sort_by_count"
+        android:showAsAction="never"
+        android:title="@string/call_stats_sort_by_count"/>
+
+</menu>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 11b5bef7e..78bf1011d 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -115,7 +115,6 @@
     <string name="description_send_text_message" msgid="7803126439934046891">"<xliff:g id="NAME">%1$s</xliff:g> mesaj göndər"</string>
     <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Eşidilməmiş səsli mesaj"</string>
     <string name="description_start_voice_search" msgid="520539488194946012">"Səs axtarışına başlayın"</string>
-    <string name="call_log_empty_gecode" msgid="5588904744812100846">"-"</string>
     <string name="menu_callNumber" msgid="997146291983360266">"<xliff:g id="NUMBER">%s</xliff:g> zəng edin"</string>
     <string name="unknown" msgid="740067747858270469">"Naməlum"</string>
     <string name="voicemail" msgid="3851469869202611441">"Səsli poçt"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 44fe8563b..708a4a0d5 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -208,22 +208,11 @@
     <string name="call_settings_label" msgid="7416182166943714852">"通话设置"</string>
     <string name="call_settings_description" msgid="2756622428019213052">"语音信箱、来电等待及其他"</string>
     <string name="select_account_dialog_title">选择账户</string>
+    <string name="dialog_title">提示</string>
 
     <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/attrs.xml b/res/values/attrs.xml
index 23f639fd2..ea03b32d4 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -33,4 +33,17 @@
 
     <declare-styleable name="SearchEditTextLayout" />
 
+    <declare-styleable name="AnchoredScrollView">
+        <attr name="anchorView" format="reference" />
+        <attr name="anchorAtBottom" format="boolean" />
+        <attr name="anchoredView" format="reference" />
+    </declare-styleable>
+
+    <declare-styleable name="LinearColorBar">
+        <attr name="redColor" format="color" />
+        <attr name="greenColor" format="color" />
+        <attr name="blueColor" format="color" />
+        <attr name="backgroundColor" format="color" />
+    </declare-styleable>
+
 </resources>
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
new file mode 100644
index 000000000..715d7de50
--- /dev/null
+++ b/res/values/cm_arrays.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="call_stats_nav_items" translatable="false">
+        <item>@string/call_stats_nav_all</item>
+        <item>@string/call_stats_nav_incoming</item>
+        <item>@string/call_stats_nav_outgoing</item>
+        <item>@string/call_stats_nav_missed</item>
+    </string-array>
+
+    <!-- 0:           sec
+         1:      min
+         2:      min  sec
+         3: hour
+         4: hour      sec
+         5: hour min
+         6: hour min  sec -->
+
+    <string-array name="call_stats_duration">
+        <item><xliff:g id="seconds" example="2 secs">%3$s</xliff:g></item>
+        <item><xliff:g id="minutes" example="2 mins">%2$s</xliff:g></item>
+        <item><xliff:g id="minutes" example="2 mins">%2$s</xliff:g> <xliff:g id="seconds" example="2 secs">%3$s</xliff:g></item>
+        <item><xliff:g id="hours" example="2 hrs">%1$s</xliff:g></item>
+        <item><xliff:g id="hours" example="2 hrs">%1$s</xliff:g> <xliff:g id="seconds" example="2 secs">%3$s</xliff:g></item>
+        <item><xliff:g id="hours" example="2 hrs">%1$s</xliff:g> <xliff:g id="minutes" example="2 mins">%2$s</xliff:g></item>
+        <item><xliff:g id="hours" example="2 hrs">%1$s</xliff:g> <xliff:g id="minutes" example="2 mins">%2$s</xliff:g> <xliff:g id="seconds" example="2 secs">%3$s</xliff:g></item>
+    </string-array>
+
+    <string-array name="forward_lookup_providers" translatable="false">
+        <item>Google</item>
+        <item>OpenStreetMap</item>
+    </string-array>
+
+    <string-array name="forward_lookup_provider_names" translatable="false">
+        <item>Google</item>
+        <item>OpenStreetMap</item>
+    </string-array>
+
+    <string-array name="people_lookup_providers" translatable="false">
+        <item>WhitePages</item>
+    </string-array>
+
+    <string-array name="people_lookup_provider_names" translatable="false">
+        <item>WhitePages (US)</item>
+    </string-array>
+
+    <string-array name="reverse_lookup_providers" translatable="false">
+        <item>OpenCnam</item>
+        <item>WhitePages</item>
+        <item>WhitePages_CA</item>
+        <item>YellowPages</item>
+        <item>YellowPages_CA</item>
+        <item>ZabaSearch</item>
+    </string-array>
+
+    <string-array name="reverse_lookup_provider_names" translatable="false">
+        <item>OpenCnam (US)</item>
+        <item>WhitePages (US)</item>
+        <item>WhitePages (CA)</item>
+        <item>YellowPages (US)</item>
+        <item>YellowPages (CA)</item>
+        <item>ZabaSearch (US)</item>
+    </string-array>
+
+</resources>
diff --git a/res/values/cm_plurals.xml b/res/values/cm_plurals.xml
new file mode 100644
index 000000000..0c4b4d21a
--- /dev/null
+++ b/res/values/cm_plurals.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <plurals name="hour">
+        <item quantity="one">1 hr</item>
+        <item quantity="other">%d hrs</item>
+    </plurals>
+    <plurals name="minute">
+        <item quantity="one">1 min</item>
+        <item quantity="other">%d mins</item>
+    </plurals>
+    <plurals name="second">
+        <item quantity="one">1 sec</item>
+        <item quantity="other">%d secs</item>
+    </plurals>
+
+    <plurals name="call">
+        <item quantity="one">1 call</item>
+        <item quantity="other">%d calls</item>
+    </plurals>
+</resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
new file mode 100644
index 000000000..f6bcdbbaf
--- /dev/null
+++ b/res/values/cm_strings.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013-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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Forward lookup -->
+    <string name="nearby_places">Nearby places</string>
+    <string name="people">People</string>
+
+    <!-- Number lookup -->
+    <string name="lookup_settings_label">Phone number lookup</string>
+    <string name="lookup_settings_description">Lookup of unknown phone numbers</string>
+    <string name="enable_forward_lookup_title">Forward lookup</string>
+    <string name="enable_forward_lookup_summary">Show nearby places when searching in the dialer</string>
+    <string name="enable_people_lookup_title">People lookup</string>
+    <string name="enable_people_lookup_summary">Show online results for people when searching in the dialer</string>
+    <string name="enable_reverse_lookup_title">Reverse lookup</string>
+    <string name="enable_reverse_lookup_summary">Look up information about the person or place for unknown numbers on incoming calls</string>
+    <string name="forward_lookup_provider_title">Forward lookup provider</string>
+    <string name="people_lookup_provider_title">People lookup provider</string>
+    <string name="reverse_lookup_provider_title">Reverse lookup provider</string>
+
+    <!-- Chinese Reverse Lookup Provider -->
+    <string name="cyngn_reverse_lookup_provider_package" translatable="false">com.cyngn.chineselocationlookup</string>
+    <string name="cyngn_reverse_lookup_provider_name">Cyngn Chinese (CN)</string>
+    <string name="cyngn_reverse_lookup_provider_value" translatable="false">CyngnChinese</string>
+
+    <!-- Description for incoming calls that were blacklisted -->
+    <string name="type_blacklist">Blacklisted call</string>
+    <string name="call_log_stats_title">Statistics</string>
+    <string name="callStatsDetailTitle">Call stat details</string>
+
+    <string name="call_stats">Call statistics</string>
+    <string name="call_stats_refresh">Refresh</string>
+    <string name="activity_title_call_stats">Call statistics</string>
+
+    <string name="call_stats_nav_all">All</string>
+    <string name="call_stats_nav_incoming">Incoming</string>
+    <string name="call_stats_nav_outgoing">Outgoing</string>
+    <string name="call_stats_nav_missed">Missed</string>
+    <string name="call_stats_incoming">Incoming: <xliff:g id="percent">%d</xliff:g>%%</string>
+    <string name="call_stats_outgoing">Outgoing: <xliff:g id="percent">%d</xliff:g>%%</string>
+    <string name="call_stats_missed">Missed</string>
+    <string name="call_stats_missed_percent">Missed: <xliff:g id="percent">%d</xliff:g>%%</string>
+    <string name="call_stats_header_total">Total: <xliff:g id="call_count">%s</xliff:g>, <xliff:g id="duration">%s</xliff:g></string>
+    <string name="call_stats_header_total_callsonly">Total: <xliff:g id="call_count">%s</xliff:g></string>
+    <string name="call_stats_filter_from">Start date</string>
+    <string name="call_stats_filter_to">End date</string>
+    <string name="call_stats_filter_picker_title">Filter range</string>
+
+    <string name="date_quick_selection">Quick selection</string>
+    <string name="date_qs_currentmonth">Current month</string>
+    <string name="date_qs_currentquarter">Current quarter</string>
+    <string name="date_qs_currentyear">Current year</string>
+    <string name="date_qs_lastweek">Last week</string>
+    <string name="date_qs_lastmonth">Last month</string>
+    <string name="date_qs_lastquarter">Last quarter</string>
+    <string name="date_qs_lastyear">Last year</string>
+
+    <string name="call_stats_date_filter">Adjust time range</string>
+    <string name="call_stats_reset_filter">Reset time range</string>
+    <string name="call_stats_sort_by_duration">Sort by call duration</string>
+    <string name="call_stats_sort_by_count">Sort by call count</string>
+
+    <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>
+
+    <!-- The string used to represent an unknown location for a phone number in the call log
+       Do not translate. -->
+    <string name="call_log_empty_geocode" translatable="false"></string>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 863bfe9d4..dc4c1daec 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -22,10 +22,6 @@
     <color name="dialer_red_highlight_color">#ff1744</color>
     <color name="dialer_green_highlight_color">#00c853</color>
 
-    <!-- Color for the setting text. -->
-    <color name="setting_primary_color">@color/dialtacts_primary_text_color</color>
-    <!-- Color for the setting description text. -->
-    <color name="setting_secondary_color">@color/dialtacts_secondary_text_color</color>
     <color name="setting_background_color">#ffffff</color>
 
     <!-- Color of the text describing an unconsumed missed call. -->
@@ -91,6 +87,9 @@
     <!-- Color for missed call icons. -->
     <color name="missed_call">#ff2e58</color>
 
+    <!-- Color for blacklist call icons. -->
+    <color name="blacklisted_call">#ff000000</color>
+
     <!-- Color for answered or outgoing call icons. -->
     <color name="answered_call">@color/dialer_green_highlight_color</color>
 
@@ -101,4 +100,12 @@
 
     <color name="floating_action_button_touch_tint">#80ffffff</color>
 
+    <!-- Text color for no favorites message -->
+    <color name="nofavorite_text_color">#777777</color>
+
+    <!-- Colors for incoming and outgoing calls in the call statistics -->
+    <color name="call_stats_incoming">#33b5e5</color>
+    <color name="call_stats_outgoing">#99cc00</color>
+    <color name="call_stats_missed">#eb1313</color>
+    <color name="call_stats_bar_background">#88888888</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 383a8faa6..3d50ed728 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -31,6 +31,8 @@
     <dimen name="call_log_indent_margin">24dip</dimen>
     <dimen name="call_log_name_margin_bottom">2dp</dimen>
     <dimen name="call_log_list_item_height">56dip</dimen>
+    <dimen name="call_log_list_contact_photo_size">64dip</dimen>
+    <dimen name="call_detail_contact_name_margin">24dip</dimen>
 
     <!-- Size of contact photos in the call log and call details. -->
     <dimen name="contact_photo_size">40dp</dimen>
@@ -141,4 +143,7 @@
     <dimen name="preference_padding_bottom">16dp</dimen>
     <dimen name="preference_side_margin">16dp</dimen>
     <dimen name="preference_summary_line_spacing_extra">4dp</dimen>
+
+    <!-- Size of the pie chart in the call stats detail activity -->
+    <dimen name="call_stats_details_chart_size">140dip</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e62149b7a..10266d83b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -831,23 +831,12 @@
 
     <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>
 
     <string name="add_to_white_list">Add to white list</string>
     <string name="add_to_black_list">Add to black list</string>
+    <string name="dialog_title">Tip</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index eb55c534d..fccf3dd2a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -104,6 +104,26 @@
     <style name="DialtactsActivityTheme" parent="DialtactsTheme">
         <item name="android:actionBarStyle">@style/DialtactsActionBarWithoutTitleStyle</item>
         <item name="android:fastScrollThumbDrawable">@drawable/fastscroll_thumb</item>
+
+    </style>
+    <!-- A theme for inflation of spinners in the dialtacts action bar -->
+    <style name="DialtactsSpinnerTheme" parent="DialtactsTheme">
+        <item name="android:textAppearanceListItemSmall">@android:style/TextAppearance.Holo.Medium.Inverse</item>
+    </style>
+
+    <style name="DialtactsActionBarSpinner"
+        parent="@*android:style/Widget.Holo.Light.Spinner.DropDown.ActionBar">
+
+        <item name="android:background">@drawable/spinner_ab_holo_dark</item>
+    </style>
+
+    <style name="CallDetailActivityTheme1" parent="android:Theme.Holo.Light">
+        <item name="android:windowBackground">@color/background_dialer_list_items</item>
+        <item name="android:gravity">top</item>
+        <item name="android:listViewStyle">@style/ListViewStyle</item>
+        <item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item>
+        <item name="android:actionOverflowButtonStyle">@style/DialtactsActionBarOverflow</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item>
     </style>
 
     <style name="CallDetailActivityTheme" parent="DialtactsThemeWithoutActionBarOverlay">
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>
diff --git a/res/xml/lookup_settings.xml b/res/xml/lookup_settings.xml
new file mode 100644
index 000000000..14d2de2d2
--- /dev/null
+++ b/res/xml/lookup_settings.xml
@@ -0,0 +1,67 @@
+<?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
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreference
+        android:key="enable_forward_lookup"
+        android:title="@string/enable_forward_lookup_title"
+        android:summary="@string/enable_forward_lookup_summary"
+        android:defaultValue="false"
+        android:persistent="false" />
+
+    <ListPreference
+        android:key="forward_lookup_provider"
+        android:title="@string/forward_lookup_provider_title"
+        android:entries="@array/forward_lookup_provider_names"
+        android:entryValues="@array/forward_lookup_providers"
+        android:dependency="enable_forward_lookup"
+        android:summary="%s"
+        android:persistent="false" />
+
+    <SwitchPreference
+        android:key="enable_people_lookup"
+        android:title="@string/enable_people_lookup_title"
+        android:summary="@string/enable_people_lookup_summary"
+        android:defaultValue="false"
+        android:persistent="false" />
+
+    <ListPreference
+        android:key="people_lookup_provider"
+        android:title="@string/people_lookup_provider_title"
+        android:entries="@array/people_lookup_provider_names"
+        android:entryValues="@array/people_lookup_providers"
+        android:summary="%s"
+        android:dependency="enable_people_lookup"
+        android:persistent="false" />
+
+    <SwitchPreference
+        android:key="enable_reverse_lookup"
+        android:title="@string/enable_reverse_lookup_title"
+        android:summary="@string/enable_reverse_lookup_summary"
+        android:defaultValue="false"
+        android:persistent="false" />
+
+    <ListPreference
+        android:key="reverse_lookup_provider"
+        android:title="@string/reverse_lookup_provider_title"
+        android:dependency="enable_reverse_lookup"
+        android:summary="%s"
+        android:persistent="false" />
+
+</PreferenceScreen>
+