From a1b886a7892df11db9a1851f2c0f38d22c1a1787 Mon Sep 17 00:00:00 2001
From: Chiao Cheng <chiaocheng@google.com>
Date: Wed, 5 Dec 2012 12:09:05 -0800
Subject: Major resource move and clean-up.

Moving resources from Contacts to ContactsCommon and Dialer as necessary to
remove dialer dependencies on contacts app.

Bug: 6993891
Change-Id: Ieb3a31c1f4f8294b17c1829bb56313ab1f3cafe7
---
 res/drawable-hdpi/ic_ab_history_holo_dark.png      | Bin 0 -> 1888 bytes
 res/drawable-hdpi/ic_dial_action_search.png        | Bin 0 -> 1691 bytes
 res/drawable-hdpi/ic_menu_overflow.png             | Bin 0 -> 526 bytes
 res/drawable-hdpi/ic_minus_disabled_holo_dark.png  | Bin 0 -> 407 bytes
 res/drawable-hdpi/ic_minus_holo_dark.png           | Bin 0 -> 391 bytes
 res/drawable-hdpi/ic_plus_disabled_holo_dark.png   | Bin 0 -> 736 bytes
 res/drawable-hdpi/ic_plus_holo_dark.png            | Bin 0 -> 685 bytes
 res/drawable-hdpi/ic_trash_holo_dark.png           | Bin 0 -> 1373 bytes
 .../list_selector_disabled_holo_dark.9.png         | Bin 0 -> 189 bytes
 res/drawable-mdpi/ic_ab_history_holo_dark.png      | Bin 0 -> 1173 bytes
 res/drawable-mdpi/ic_dial_action_search.png        | Bin 0 -> 1140 bytes
 res/drawable-mdpi/ic_menu_overflow.png             | Bin 0 -> 445 bytes
 res/drawable-mdpi/ic_minus_disabled_holo_dark.png  | Bin 0 -> 391 bytes
 res/drawable-mdpi/ic_minus_holo_dark.png           | Bin 0 -> 366 bytes
 res/drawable-mdpi/ic_plus_disabled_holo_dark.png   | Bin 0 -> 624 bytes
 res/drawable-mdpi/ic_plus_holo_dark.png            | Bin 0 -> 572 bytes
 res/drawable-mdpi/ic_trash_holo_dark.png           | Bin 0 -> 973 bytes
 .../list_selector_disabled_holo_dark.9.png         | Bin 0 -> 172 bytes
 res/drawable-xhdpi/ic_ab_history_holo_dark.png     | Bin 0 -> 2757 bytes
 res/drawable-xhdpi/ic_dial_action_search.png       | Bin 0 -> 2461 bytes
 res/drawable-xhdpi/ic_menu_overflow.png            | Bin 0 -> 554 bytes
 res/drawable-xhdpi/ic_minus_disabled_holo_dark.png | Bin 0 -> 421 bytes
 res/drawable-xhdpi/ic_minus_holo_dark.png          | Bin 0 -> 438 bytes
 res/drawable-xhdpi/ic_plus_disabled_holo_dark.png  | Bin 0 -> 756 bytes
 res/drawable-xhdpi/ic_plus_holo_dark.png           | Bin 0 -> 761 bytes
 res/drawable-xhdpi/ic_trash_holo_dark.png          | Bin 0 -> 1763 bytes
 .../list_selector_disabled_holo_dark.9.png         | Bin 0 -> 190 bytes
 res/drawable/ic_minus.xml                          |  20 ++
 res/drawable/ic_plus.xml                           |  20 ++
 res/drawable/ic_tab_recent.xml                     |  21 ++
 .../account_filter_header_for_phone_favorite.xml   |  36 +++
 res/layout/empty2.xml                              |  29 ++
 res/layout/phone_contact_tile_list.xml             |  47 +++
 res/layout/phone_loading_contacts.xml              |  40 +++
 res/menu/phone_favorite_options.xml                |  28 ++
 res/values-land/styles.xml                         |  22 ++
 res/values/colors.xml                              |  17 ++
 res/values/dimens.xml                              |   1 +
 res/values/strings.xml                             | 337 +++++++++++++++++++++
 res/values/styles.xml                              |   3 +
 40 files changed, 621 insertions(+)
 create mode 100644 res/drawable-hdpi/ic_ab_history_holo_dark.png
 create mode 100644 res/drawable-hdpi/ic_dial_action_search.png
 create mode 100644 res/drawable-hdpi/ic_menu_overflow.png
 create mode 100644 res/drawable-hdpi/ic_minus_disabled_holo_dark.png
 create mode 100644 res/drawable-hdpi/ic_minus_holo_dark.png
 create mode 100644 res/drawable-hdpi/ic_plus_disabled_holo_dark.png
 create mode 100644 res/drawable-hdpi/ic_plus_holo_dark.png
 create mode 100644 res/drawable-hdpi/ic_trash_holo_dark.png
 create mode 100644 res/drawable-hdpi/list_selector_disabled_holo_dark.9.png
 create mode 100644 res/drawable-mdpi/ic_ab_history_holo_dark.png
 create mode 100644 res/drawable-mdpi/ic_dial_action_search.png
 create mode 100644 res/drawable-mdpi/ic_menu_overflow.png
 create mode 100644 res/drawable-mdpi/ic_minus_disabled_holo_dark.png
 create mode 100644 res/drawable-mdpi/ic_minus_holo_dark.png
 create mode 100644 res/drawable-mdpi/ic_plus_disabled_holo_dark.png
 create mode 100644 res/drawable-mdpi/ic_plus_holo_dark.png
 create mode 100644 res/drawable-mdpi/ic_trash_holo_dark.png
 create mode 100644 res/drawable-mdpi/list_selector_disabled_holo_dark.9.png
 create mode 100644 res/drawable-xhdpi/ic_ab_history_holo_dark.png
 create mode 100644 res/drawable-xhdpi/ic_dial_action_search.png
 create mode 100644 res/drawable-xhdpi/ic_menu_overflow.png
 create mode 100644 res/drawable-xhdpi/ic_minus_disabled_holo_dark.png
 create mode 100644 res/drawable-xhdpi/ic_minus_holo_dark.png
 create mode 100644 res/drawable-xhdpi/ic_plus_disabled_holo_dark.png
 create mode 100644 res/drawable-xhdpi/ic_plus_holo_dark.png
 create mode 100644 res/drawable-xhdpi/ic_trash_holo_dark.png
 create mode 100644 res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png
 create mode 100644 res/drawable/ic_minus.xml
 create mode 100644 res/drawable/ic_plus.xml
 create mode 100644 res/drawable/ic_tab_recent.xml
 create mode 100644 res/layout/account_filter_header_for_phone_favorite.xml
 create mode 100644 res/layout/empty2.xml
 create mode 100644 res/layout/phone_contact_tile_list.xml
 create mode 100644 res/layout/phone_loading_contacts.xml
 create mode 100644 res/menu/phone_favorite_options.xml
 create mode 100644 res/values-land/styles.xml

diff --git a/res/drawable-hdpi/ic_ab_history_holo_dark.png b/res/drawable-hdpi/ic_ab_history_holo_dark.png
new file mode 100644
index 000000000..1edab8db0
Binary files /dev/null and b/res/drawable-hdpi/ic_ab_history_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_dial_action_search.png b/res/drawable-hdpi/ic_dial_action_search.png
new file mode 100644
index 000000000..898ce1110
Binary files /dev/null and b/res/drawable-hdpi/ic_dial_action_search.png differ
diff --git a/res/drawable-hdpi/ic_menu_overflow.png b/res/drawable-hdpi/ic_menu_overflow.png
new file mode 100644
index 000000000..a12aedfaf
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_overflow.png differ
diff --git a/res/drawable-hdpi/ic_minus_disabled_holo_dark.png b/res/drawable-hdpi/ic_minus_disabled_holo_dark.png
new file mode 100644
index 000000000..c2ad8dc37
Binary files /dev/null and b/res/drawable-hdpi/ic_minus_disabled_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_minus_holo_dark.png b/res/drawable-hdpi/ic_minus_holo_dark.png
new file mode 100644
index 000000000..f228047a5
Binary files /dev/null and b/res/drawable-hdpi/ic_minus_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_plus_disabled_holo_dark.png b/res/drawable-hdpi/ic_plus_disabled_holo_dark.png
new file mode 100644
index 000000000..723e362e7
Binary files /dev/null and b/res/drawable-hdpi/ic_plus_disabled_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_plus_holo_dark.png b/res/drawable-hdpi/ic_plus_holo_dark.png
new file mode 100644
index 000000000..d7b28042a
Binary files /dev/null and b/res/drawable-hdpi/ic_plus_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_trash_holo_dark.png b/res/drawable-hdpi/ic_trash_holo_dark.png
new file mode 100644
index 000000000..ec925f1de
Binary files /dev/null and b/res/drawable-hdpi/ic_trash_holo_dark.png differ
diff --git a/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png b/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png
new file mode 100644
index 000000000..f6fd30dcd
Binary files /dev/null and b/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png differ
diff --git a/res/drawable-mdpi/ic_ab_history_holo_dark.png b/res/drawable-mdpi/ic_ab_history_holo_dark.png
new file mode 100644
index 000000000..85bf5f38c
Binary files /dev/null and b/res/drawable-mdpi/ic_ab_history_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_dial_action_search.png b/res/drawable-mdpi/ic_dial_action_search.png
new file mode 100644
index 000000000..88cba92d9
Binary files /dev/null and b/res/drawable-mdpi/ic_dial_action_search.png differ
diff --git a/res/drawable-mdpi/ic_menu_overflow.png b/res/drawable-mdpi/ic_menu_overflow.png
new file mode 100644
index 000000000..4a3bde3b1
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_overflow.png differ
diff --git a/res/drawable-mdpi/ic_minus_disabled_holo_dark.png b/res/drawable-mdpi/ic_minus_disabled_holo_dark.png
new file mode 100644
index 000000000..fb0103c94
Binary files /dev/null and b/res/drawable-mdpi/ic_minus_disabled_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_minus_holo_dark.png b/res/drawable-mdpi/ic_minus_holo_dark.png
new file mode 100644
index 000000000..a02099170
Binary files /dev/null and b/res/drawable-mdpi/ic_minus_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_plus_disabled_holo_dark.png b/res/drawable-mdpi/ic_plus_disabled_holo_dark.png
new file mode 100644
index 000000000..70c9a3d9d
Binary files /dev/null and b/res/drawable-mdpi/ic_plus_disabled_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_plus_holo_dark.png b/res/drawable-mdpi/ic_plus_holo_dark.png
new file mode 100644
index 000000000..4f6397cb2
Binary files /dev/null and b/res/drawable-mdpi/ic_plus_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_trash_holo_dark.png b/res/drawable-mdpi/ic_trash_holo_dark.png
new file mode 100644
index 000000000..291fc66f3
Binary files /dev/null and b/res/drawable-mdpi/ic_trash_holo_dark.png differ
diff --git a/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png b/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png
new file mode 100644
index 000000000..92da2f0dd
Binary files /dev/null and b/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png differ
diff --git a/res/drawable-xhdpi/ic_ab_history_holo_dark.png b/res/drawable-xhdpi/ic_ab_history_holo_dark.png
new file mode 100644
index 000000000..98cc1af35
Binary files /dev/null and b/res/drawable-xhdpi/ic_ab_history_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_dial_action_search.png b/res/drawable-xhdpi/ic_dial_action_search.png
new file mode 100644
index 000000000..fe3aa2486
Binary files /dev/null and b/res/drawable-xhdpi/ic_dial_action_search.png differ
diff --git a/res/drawable-xhdpi/ic_menu_overflow.png b/res/drawable-xhdpi/ic_menu_overflow.png
new file mode 100644
index 000000000..715cff8c8
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_overflow.png differ
diff --git a/res/drawable-xhdpi/ic_minus_disabled_holo_dark.png b/res/drawable-xhdpi/ic_minus_disabled_holo_dark.png
new file mode 100644
index 000000000..ae6bce7f8
Binary files /dev/null and b/res/drawable-xhdpi/ic_minus_disabled_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_minus_holo_dark.png b/res/drawable-xhdpi/ic_minus_holo_dark.png
new file mode 100644
index 000000000..0e95a6bdd
Binary files /dev/null and b/res/drawable-xhdpi/ic_minus_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_plus_disabled_holo_dark.png b/res/drawable-xhdpi/ic_plus_disabled_holo_dark.png
new file mode 100644
index 000000000..169da3e96
Binary files /dev/null and b/res/drawable-xhdpi/ic_plus_disabled_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_plus_holo_dark.png b/res/drawable-xhdpi/ic_plus_holo_dark.png
new file mode 100644
index 000000000..b869bf9b1
Binary files /dev/null and b/res/drawable-xhdpi/ic_plus_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_trash_holo_dark.png b/res/drawable-xhdpi/ic_trash_holo_dark.png
new file mode 100644
index 000000000..70e4d30ab
Binary files /dev/null and b/res/drawable-xhdpi/ic_trash_holo_dark.png differ
diff --git a/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png b/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png
new file mode 100644
index 000000000..88726b691
Binary files /dev/null and b/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png differ
diff --git a/res/drawable/ic_minus.xml b/res/drawable/ic_minus.xml
new file mode 100644
index 000000000..9750127d7
--- /dev/null
+++ b/res/drawable/ic_minus.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:drawable="@drawable/ic_minus_disabled_holo_dark" />
+    <item android:drawable="@drawable/ic_minus_holo_dark" />
+</selector>
diff --git a/res/drawable/ic_plus.xml b/res/drawable/ic_plus.xml
new file mode 100644
index 000000000..176b21a0e
--- /dev/null
+++ b/res/drawable/ic_plus.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:drawable="@drawable/ic_plus_disabled_holo_dark" />
+    <item android:drawable="@drawable/ic_plus_holo_dark" />
+</selector>
diff --git a/res/drawable/ic_tab_recent.xml b/res/drawable/ic_tab_recent.xml
new file mode 100644
index 000000000..203bc4f0c
--- /dev/null
+++ b/res/drawable/ic_tab_recent.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2012 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:drawable="@drawable/ic_ab_history_holo_dark" />
+</selector>
+
diff --git a/res/layout/account_filter_header_for_phone_favorite.xml b/res/layout/account_filter_header_for_phone_favorite.xml
new file mode 100644
index 000000000..6f1d23da9
--- /dev/null
+++ b/res/layout/account_filter_header_for_phone_favorite.xml
@@ -0,0 +1,36 @@
+<?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 showing the type of account filter for phone favorite screen
+     (or, new phone "all" screen).
+     This is very similar to account_filter_header.xml but different in its
+     top padding. -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/account_filter_header_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="8dip"
+    android:layout_marginLeft="@dimen/contact_browser_list_header_left_margin"
+    android:layout_marginRight="@dimen/contact_browser_list_header_right_margin"
+    android:background="?android:attr/selectableItemBackground"
+    android:visibility="gone">
+    <TextView
+        android:id="@+id/account_filter_header"
+        style="@style/ContactListSeparatorTextViewStyle"
+        android:paddingLeft="@dimen/contact_browser_list_item_text_indent" />
+</LinearLayout>
diff --git a/res/layout/empty2.xml b/res/layout/empty2.xml
new file mode 100644
index 000000000..349dcfa10
--- /dev/null
+++ b/res/layout/empty2.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<!-- Hack for show empty hidden menu item without using android:icon.
+     See dialtact_options.xml for more detail.
+
+     TODO: figure out better way -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_dial_action_search"
+        android:visibility="invisible"/>
+</FrameLayout>
diff --git a/res/layout/phone_contact_tile_list.xml b/res/layout/phone_contact_tile_list.xml
new file mode 100644
index 000000000..8931cf6c6
--- /dev/null
+++ b/res/layout/phone_contact_tile_list.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<!-- Use LinearLayout + FrameLayout, just to rely on android:divider and android:showDividers -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/FragmentActionBarPadding"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:divider="?android:attr/dividerHorizontal"
+    android:showDividers="end">
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <ListView
+            android:id="@+id/contact_tile_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingTop="@dimen/contact_tile_list_padding_top"
+            android:clipToPadding="false"
+            android:fadingEdge="none"
+            android:divider="@null" />
+
+        <TextView
+            android:id="@+id/contact_tile_list_empty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:layout_marginTop="@dimen/empty_message_top_margin"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textAppearance="?android:attr/textAppearanceLarge"/>
+    </FrameLayout>
+</LinearLayout>
diff --git a/res/layout/phone_loading_contacts.xml b/res/layout/phone_loading_contacts.xml
new file mode 100644
index 000000000..f0d33288e
--- /dev/null
+++ b/res/layout/phone_loading_contacts.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<!-- "Loading" text with a spinner, which is used in PhoneFavorite screen -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal"
+    android:gravity="left|center_vertical">
+
+    <ProgressBar
+        android:indeterminate="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/progress_spinner"/>
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/contact_list_loading"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_marginLeft="4dip" />
+
+</LinearLayout>
diff --git a/res/menu/phone_favorite_options.xml b/res/menu/phone_favorite_options.xml
new file mode 100644
index 000000000..e37759c14
--- /dev/null
+++ b/res/menu/phone_favorite_options.xml
@@ -0,0 +1,28 @@
+<?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_import_export"
+        android:title="@string/menu_import_export" />
+
+    <item
+        android:id="@+id/menu_clear_frequents"
+        android:title="@string/menu_clear_frequents" />
+
+    <item
+        android:id="@+id/menu_accounts"
+        android:title="@string/menu_accounts" />
+</menu>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
new file mode 100644
index 000000000..1388a17f1
--- /dev/null
+++ b/res/values-land/styles.xml
@@ -0,0 +1,22 @@
+<!--
+  Copyright (C) 2012 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.
+  -->
+
+<resources>
+
+    <style name="FragmentActionBarPadding">
+        <item name="android:paddingBottom">0dp</item>
+    </style>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2828725ac..ebdc2f60e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -21,4 +21,21 @@
     <color name="smartdial_confidence_drawable_color">#39caff</color>
     <color name="smartdial_highlighted_text_color">#ffffff</color>
 
+    <!-- Color of the text describing an unconsumed missed call. -->
+    <color name="call_log_missed_call_highlight_color">#FF0000</color>
+
+    <!-- Color of the text describing an unconsumed voicemail. -->
+    <color name="call_log_voicemail_highlight_color">#33b5e5</color>
+
+    <!-- Colour background for the voicemail playback ui. -->
+    <color name="voicemail_playback_ui_background">@android:color/black</color>
+
+    <!-- Colour of voicemail progress bar to the right of position indicator. -->
+    <color name="voicemail_playback_seek_bar_yet_to_play">#44ffffff</color>
+
+    <!-- Colour of voicemail progress bar to the left of position indicator. -->
+    <color name="voicemail_playback_seek_bar_already_played">#ccffffff</color>
+
+    <!-- Standard color for selected items. -->
+    <color name="item_selected">#660099cc</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4034f7303..5d7412b87 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -55,4 +55,5 @@
     <dimen name="smartdial_suggestions_padding">4dp</dimen>
     <dimen name="smartdial_suggestions_extra_padding">2dp</dimen>
     <dimen name="smartdial_confidence_hint_text_size">27dp</dimen>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 86c36c493..5c85bf9ec 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -186,4 +186,341 @@
 
     <!-- Message next to disamgiguation dialog check box -->
     <string name="make_primary">Remember this choice</string>
+
+    <!-- String describing the image on ImageButton one
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_image_button_one">one</string>
+
+    <!-- String describing the image on ImageButton two
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_image_button_two">two</string>
+
+    <!-- String describing the image on ImageButton three
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_image_button_three">three</string>
+
+    <!-- String describing the image on ImageButton four
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_image_button_four">four</string>
+
+    <!-- String describing the image on ImageButton five
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_image_button_five">five</string>
+
+    <!-- String describing the image on ImageButton six
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_image_button_six">six</string>
+
+    <!-- String describing the image on ImageButton seven
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_image_button_seven">seven</string>
+
+    <!-- String describing the image on ImageButton eight
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_image_button_eight">eight</string>
+
+    <!-- String describing the image on ImageButton nine
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_image_button_nine">nine</string>
+
+    <!-- String describing the image on ImageButton star
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_image_button_star">star</string>
+
+    <!-- String describing the image on ImageButton zero
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_image_button_zero">zero</string>
+
+    <!-- String describing the image on ImageButton pound
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_image_button_pound">pound</string>
+
+    <!-- String describing the Voicemail ImageButton
+
+         Used by AccessibilityService to announce the purpose of the button.
+    -->
+    <string name="description_voicemail_button">voicemail</string>
+
+    <!-- String describing the Search ImageButton
+
+         Used by AccessibilityService to announce the purpose of the button.
+         [CHAR LIMIT=NONE]
+    -->
+    <string name="description_search_button">search</string>
+
+    <!-- String describing the Dial ImageButton
+
+         Used by AccessibilityService to announce the purpose of the button.
+    -->
+    <string name="description_dial_button">dial</string>
+
+    <!-- String describing the Delete/Backspace ImageButton
+
+         Used by AccessibilityService to announce the purpose of the button.
+    -->
+    <string name="description_delete_button">backspace</string>
+
+    <!-- String describing the digits text box containing the number to dial.
+
+         Used by AccessibilityService to announce the purpose of the view.
+    -->
+    <string name="description_digits_edittext">number to dial</string>
+
+    <!-- Content description for the fake action menu overflow button.
+         This should be same as the description for the real action menu
+         overflow button available in ActionBar.
+         [CHAR LIMIT=NONE] -->
+    <string name="action_menu_overflow_description" msgid="2295659037509008453">More options</string>
+
+    <!-- Menu item to copy something [CHAR_LIMIT=10] -->
+    <string name="menu_copy">Copy</string>
+
+    <!-- Menu item used to show only outgoing in the call log. [CHAR LIMIT=30] -->
+    <string name="menu_show_outgoing_only">Show outgoing only</string>
+
+    <!-- Menu item used to show only incoming in the call log. [CHAR LIMIT=30] -->
+    <string name="menu_show_incoming_only">Show incoming only</string>
+
+    <!-- Menu item used to show only missed in the call log. [CHAR LIMIT=30] -->
+    <string name="menu_show_missed_only">Show missed only</string>
+
+    <!-- Menu item used to show only voicemails in the call log. [CHAR LIMIT=30] -->
+    <string name="menu_show_voicemails_only">Show voicemails only</string>
+
+    <!-- Menu item used to show all calls in the call log. [CHAR LIMIT=30] -->
+    <string name="menu_show_all_calls">Show all calls</string>
+
+    <!-- Menu items for dialpad options as part of Pause and Wait ftr -->
+    <string name="add_2sec_pause">Add 2-sec pause</string>
+    <string name="add_wait">Add wait</string>
+
+    <!-- Menu item label for call settings [CHAR LIMIT=30] -->
+    <string name="call_settings">Settings</string>
+
+    <!-- Menu item to create a new contact -->
+    <string name="menu_newContact">New contact</string>
+
+    <!-- Title bar for call detail screen -->
+    <string name="callDetailTitle">Call details</string>
+
+    <!-- Toast for call detail screen when couldn't read the requested details -->
+    <string name="toast_call_detail_error">Couldn\'t read details for the requested call.</string>
+
+    <!-- Item label: jump to the in-call DTMF dialpad.
+         (Part of a list of options shown in the dialer when another call
+         is already in progress.) -->
+    <string name="dialer_useDtmfDialpad">Use touch tone keypad</string>
+
+    <!-- Item label: jump to the in-call UI.
+         (Part of a list of options shown in the dialer when another call
+         is already in progress.) -->
+    <string name="dialer_returnToInCallScreen">Return to call in progress</string>
+
+    <!-- Item label: use the Dialer's dialpad to add another call.
+         (Part of a list of options shown in the dialer when another call
+         is already in progress.) -->
+    <string name="dialer_addAnotherCall">Add call</string>
+
+    <!-- Title for incoming call details screen -->
+    <string name="type_incoming">Incoming call</string>
+
+    <!-- Title for outgoing call details screen -->
+    <string name="type_outgoing">Outgoing call</string>
+
+    <!-- Title for missed call details screen -->
+    <string name="type_missed">Missed call</string>
+
+    <!-- Title for voicemail details screen -->
+    <string name="type_voicemail">Voicemail</string>
+
+    <!-- Description for incoming calls going to voice mail vs. not -->
+    <string name="actionIncomingCall">Incoming calls</string>
+
+    <!-- String describing the icon in the call log used to play a voicemail.
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_call_log_play_button">Play voicemail</string>
+
+    <!-- String describing the icon in the call log used to represent an incoming call.
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_call_log_incoming_call">Incoming call</string>
+
+    <!-- String describing the icon in the call log used to represent an outgoing call.
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+
+    <string name="description_call_log_outgoing_call">Outgoing call</string>
+
+    <!-- String describing the icon in the call log used to represent a missed call.
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+
+    <string name="description_call_log_missed_call">Missed call</string>
+
+    <!-- String describing the icon in the call log used to represent a voicemail left to the user.
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_call_log_voicemail">Voicemail</string>
+
+    <!-- String describing the button to add a contact for the current number.
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_add_contact">Add contact</string>
+
+    <!-- String describing the button to view the contact for the current number.
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_view_contact">View contact <xliff:g id="name">%1$s</xliff:g></string>
+
+    <!-- String describing the button to call a number or contact.
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_call">Call <xliff:g id="name">%1$s</xliff:g></string>
+
+
+    <!-- String describing the button to SMS a number or contact.
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+              [CHAR LIMIT=NONE]
+    -->
+    <string name="description_send_text_message">Send text message to <xliff:g id="name">%1$s</xliff:g></string>
+
+    <!-- String describing the icon in the call log used to represent an unheard voicemail left to
+         the user.
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+              [CHAR LIMIT=NONE]
+    -->
+    <string name="description_call_log_unheard_voicemail">Unheard voicemail</string>
+
+    <!-- String describing the button to send a text message on quick contact.
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+              [CHAR LIMIT=NONE]
+    -->
+    <string name="description_send_message">Send message to <xliff:g id="name">%1$s</xliff:g></string>
+
+    <!-- String describing the text for a phone number in quick contact.
+
+        Note: AccessibilityServices use this attribute to announce what the view represents.
+              This is especially valuable for views without textual representation like ImageView.
+    -->
+    <string name="description_dial_phone_number">Dial phone <xliff:g id="name">%1$s</xliff:g></string>
+
+    <!-- The string used to represent an unknown location for a phone number in the call log [CHAR LIMIT=3] -->
+    <string name="call_log_empty_gecode">-</string>
+
+    <!-- Menu item used to call a contact, containing the number of the contact to call -->
+    <string name="menu_callNumber">Call <xliff:g id="number">%s</xliff:g></string>
+
+    <!-- String used to display calls from unknown numbers in the call log -->
+    <string name="unknown">Unknown</string>
+
+    <!-- String used for displaying calls to the voicemail number in the call log -->
+    <string name="voicemail">Voicemail</string>
+
+    <!-- String used to display calls from private numbers in the call log -->
+    <string name="private_num">Private number</string>
+
+    <!-- String used to display calls from pay phone in the call log -->
+    <string name="payphone">Pay phone</string>
+
+    <!-- Displayed in the text entry box in the dialer when in landscape mode to guide the user
+         to dial using the physical keyboard -->
+    <string name="dialerKeyboardHintText">Use keyboard to dial</string>
+
+    <!-- Hint text displayed in the "digits" field above the dialer's
+         dialpad, if there's already a call in progress.  (This hint
+         reminds the user that the dialer will add a new call, as opposed
+         to sending DTMF tones over the current call.)
+         [CHAR LIMIT=40] -->
+    <string name="dialerDialpadHintText">Dial to add a call</string>
+
+    <!-- A nicely formatted call duration displayed when viewing call details. For example "42 mins 28 secs" -->
+    <string name="callDetailsDurationFormat"><xliff:g id="minutes" example="42">%s</xliff:g> mins <xliff:g id="seconds" example="28">%s</xliff:g> secs</string>
+
+    <!-- Dialog message which is shown when the user tries to make a phone call
+         to prohibited phone numbers [CHAR LIMIT=NONE] -->
+    <string name="dialog_phone_call_prohibited_message" msgid="4313552620858880999">Call not sent</string>
+
+    <!-- Dialog message which is shown when the user tries to check voicemail
+         while the system isn't ready for the access. [CHAR LIMIT=NONE] -->
+    <string name="dialog_voicemail_not_ready_message">To set up voicemail, go to Menu &gt; Settings.</string>
+
+    <!-- Dialog message which is shown when the user tries to check voicemail
+         while the system is in airplane mode. The user cannot access to
+         voicemail service in Airplane mode. [CHAR LIMI=NONE] -->
+    <string name="dialog_voicemail_airplane_mode_message">To call voicemail, first turn off Airplane mode.</string>
+
+    <!-- Message that appears in the favorites tab of the Phone app when the contact list has not fully loaded yet (below the favorite and frequent contacts) [CHAR LIMIT=20] -->
+    <string name="contact_list_loading">Loading\u2026</string>
+
+    <!-- The title of a dialog that displays the IMEI of the phone -->
+    <string name="imei">IMEI</string>
+
+    <!-- The title of a dialog that displays the MEID of the CDMA phone -->
+    <string name="meid">MEID</string>
+
+    <!-- Dialog text displayed when loading a phone number from the SIM card for speed dial -->
+    <string name="simContacts_emptyLoading">Loading from SIM card\u2026</string>
+
+    <!-- Dialog title displayed when loading a phone number from the SIM card for speed dial -->
+    <string name="simContacts_title">SIM card contacts</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4f64cb37a..099bfd51d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -120,4 +120,7 @@
         <item name="android:overScrollMode">always</item>
     </style>
 
+    <style name="FragmentActionBarPadding">
+        <item name="android:paddingBottom">?android:attr/actionBarSize</item>
+    </style>
 </resources>
-- 
cgit v1.2.3