summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChiao Cheng <chiaocheng@google.com>2012-09-05 16:00:16 -0700
committerChiao Cheng <chiaocheng@google.com>2012-09-05 16:00:16 -0700
commit9d4f3b20793a007b4489547aa40fc1049d0d8fef (patch)
tree4903ec17ccdc74d6c5977767052b2529b77bba14
parent91197049c458f07092b31501d2ed512180b13d58 (diff)
Moving resources from Contacts to Dialer.
- Also moving some shared utilities. Bug: 6993891 Change-Id: I5fa18d26e4f5423f4d3f3450b8f3e3dacbfb947a
-rw-r--r--Android.mk12
-rw-r--r--res/drawable-hdpi/btn_call_pressed.pngbin0 -> 500 bytes
-rw-r--r--res/drawable-hdpi/dial_background_texture.pngbin0 -> 99 bytes
-rw-r--r--res/drawable-hdpi/dial_num_0_wht.pngbin0 -> 2220 bytes
-rw-r--r--res/drawable-hdpi/dial_num_1_wht.pngbin0 -> 1689 bytes
-rw-r--r--res/drawable-hdpi/dial_num_2_wht.pngbin0 -> 2735 bytes
-rw-r--r--res/drawable-hdpi/dial_num_3_wht.pngbin0 -> 2889 bytes
-rw-r--r--res/drawable-hdpi/dial_num_4_wht.pngbin0 -> 1974 bytes
-rw-r--r--res/drawable-hdpi/dial_num_5_wht.pngbin0 -> 2564 bytes
-rw-r--r--res/drawable-hdpi/dial_num_6_wht.pngbin0 -> 3133 bytes
-rw-r--r--res/drawable-hdpi/dial_num_7_wht.pngbin0 -> 2500 bytes
-rw-r--r--res/drawable-hdpi/dial_num_8_wht.pngbin0 -> 3310 bytes
-rw-r--r--res/drawable-hdpi/dial_num_9_wht.pngbin0 -> 3399 bytes
-rw-r--r--res/drawable-hdpi/dial_num_pound_wht.pngbin0 -> 1090 bytes
-rw-r--r--res/drawable-hdpi/dial_num_star_wht.pngbin0 -> 1048 bytes
-rw-r--r--res/drawable-hdpi/ic_ab_dialer_holo_dark.pngbin0 -> 1487 bytes
-rw-r--r--res/drawable-hdpi/ic_call_incoming_holo_dark.pngbin0 -> 574 bytes
-rw-r--r--res/drawable-hdpi/ic_call_missed_holo_dark.pngbin0 -> 569 bytes
-rw-r--r--res/drawable-hdpi/ic_call_outgoing_holo_dark.pngbin0 -> 585 bytes
-rw-r--r--res/drawable-hdpi/ic_call_voicemail_holo_dark.pngbin0 -> 919 bytes
-rw-r--r--res/drawable-hdpi/ic_dial_action_call.pngbin0 -> 2548 bytes
-rw-r--r--res/drawable-hdpi/ic_dial_action_delete.pngbin0 -> 1219 bytes
-rwxr-xr-xres/drawable-hdpi/ic_dialer_fork_add_call.pngbin0 -> 2501 bytes
-rwxr-xr-xres/drawable-hdpi/ic_dialer_fork_current_call.pngbin0 -> 2844 bytes
-rwxr-xr-xres/drawable-hdpi/ic_dialer_fork_tt_keypad.pngbin0 -> 3052 bytes
-rw-r--r--res/drawable-hdpi/ic_hold_pause_disabled_holo_dark.pngbin0 -> 663 bytes
-rw-r--r--res/drawable-hdpi/ic_hold_pause_holo_dark.pngbin0 -> 669 bytes
-rw-r--r--res/drawable-hdpi/ic_play_active_holo_dark.pngbin0 -> 1855 bytes
-rw-r--r--res/drawable-hdpi/ic_play_disabled_holo_dark.pngbin0 -> 1172 bytes
-rw-r--r--res/drawable-hdpi/ic_play_holo_dark.pngbin0 -> 1099 bytes
-rw-r--r--res/drawable-hdpi/ic_sound_off_speakerphone_disabled_holo_dark.pngbin0 -> 1502 bytes
-rw-r--r--res/drawable-hdpi/ic_sound_off_speakerphone_holo_dark.pngbin0 -> 1447 bytes
-rw-r--r--res/drawable-hdpi/ic_sound_speakerphone_disabled_holo_dark.pngbin0 -> 1855 bytes
-rw-r--r--res/drawable-hdpi/ic_sound_speakerphone_holo_dark.pngbin0 -> 1953 bytes
-rw-r--r--res/drawable-mdpi/btn_call_pressed.pngbin0 -> 422 bytes
-rw-r--r--res/drawable-mdpi/dial_background_texture.pngbin0 -> 276 bytes
-rw-r--r--res/drawable-mdpi/dial_num_0_wht.pngbin0 -> 1496 bytes
-rw-r--r--res/drawable-mdpi/dial_num_1_wht.pngbin0 -> 1137 bytes
-rw-r--r--res/drawable-mdpi/dial_num_2_wht.pngbin0 -> 1820 bytes
-rw-r--r--res/drawable-mdpi/dial_num_3_wht.pngbin0 -> 1941 bytes
-rw-r--r--res/drawable-mdpi/dial_num_4_wht.pngbin0 -> 1404 bytes
-rw-r--r--res/drawable-mdpi/dial_num_5_wht.pngbin0 -> 1769 bytes
-rw-r--r--res/drawable-mdpi/dial_num_6_wht.pngbin0 -> 2023 bytes
-rw-r--r--res/drawable-mdpi/dial_num_7_wht.pngbin0 -> 1618 bytes
-rw-r--r--res/drawable-mdpi/dial_num_8_wht.pngbin0 -> 2097 bytes
-rw-r--r--res/drawable-mdpi/dial_num_9_wht.pngbin0 -> 2185 bytes
-rw-r--r--res/drawable-mdpi/dial_num_pound_wht.pngbin0 -> 805 bytes
-rw-r--r--res/drawable-mdpi/dial_num_star_wht.pngbin0 -> 757 bytes
-rw-r--r--res/drawable-mdpi/ic_ab_dialer_holo_dark.pngbin0 -> 1019 bytes
-rw-r--r--res/drawable-mdpi/ic_call_incoming_holo_dark.pngbin0 -> 458 bytes
-rw-r--r--res/drawable-mdpi/ic_call_missed_holo_dark.pngbin0 -> 456 bytes
-rw-r--r--res/drawable-mdpi/ic_call_outgoing_holo_dark.pngbin0 -> 446 bytes
-rw-r--r--res/drawable-mdpi/ic_call_voicemail_holo_dark.pngbin0 -> 622 bytes
-rw-r--r--res/drawable-mdpi/ic_dial_action_call.pngbin0 -> 1711 bytes
-rw-r--r--res/drawable-mdpi/ic_dial_action_delete.pngbin0 -> 959 bytes
-rw-r--r--res/drawable-mdpi/ic_dialer_fork_add_call.pngbin0 -> 1309 bytes
-rw-r--r--res/drawable-mdpi/ic_dialer_fork_current_call.pngbin0 -> 1470 bytes
-rw-r--r--res/drawable-mdpi/ic_dialer_fork_tt_keypad.pngbin0 -> 1618 bytes
-rw-r--r--res/drawable-mdpi/ic_hold_pause_disabled_holo_dark.pngbin0 -> 513 bytes
-rw-r--r--res/drawable-mdpi/ic_hold_pause_holo_dark.pngbin0 -> 492 bytes
-rw-r--r--res/drawable-mdpi/ic_play_active_holo_dark.pngbin0 -> 1380 bytes
-rw-r--r--res/drawable-mdpi/ic_play_disabled_holo_dark.pngbin0 -> 881 bytes
-rw-r--r--res/drawable-mdpi/ic_play_holo_dark.pngbin0 -> 819 bytes
-rw-r--r--res/drawable-mdpi/ic_sound_off_speakerphone_disabled_holo_dark.pngbin0 -> 1043 bytes
-rw-r--r--res/drawable-mdpi/ic_sound_off_speakerphone_holo_dark.pngbin0 -> 996 bytes
-rw-r--r--res/drawable-mdpi/ic_sound_speakerphone_disabled_holo_dark.pngbin0 -> 1175 bytes
-rw-r--r--res/drawable-mdpi/ic_sound_speakerphone_holo_dark.pngbin0 -> 1246 bytes
-rw-r--r--res/drawable-xhdpi/btn_call_pressed.pngbin0 -> 617 bytes
-rw-r--r--res/drawable-xhdpi/dial_background_texture.pngbin0 -> 114 bytes
-rw-r--r--res/drawable-xhdpi/dial_num_0_wht.pngbin0 -> 2720 bytes
-rw-r--r--res/drawable-xhdpi/dial_num_1_wht.pngbin0 -> 2201 bytes
-rw-r--r--res/drawable-xhdpi/dial_num_2_wht.pngbin0 -> 3624 bytes
-rw-r--r--res/drawable-xhdpi/dial_num_3_wht.pngbin0 -> 3695 bytes
-rw-r--r--res/drawable-xhdpi/dial_num_4_wht.pngbin0 -> 2508 bytes
-rw-r--r--res/drawable-xhdpi/dial_num_5_wht.pngbin0 -> 3304 bytes
-rw-r--r--res/drawable-xhdpi/dial_num_6_wht.pngbin0 -> 4061 bytes
-rw-r--r--res/drawable-xhdpi/dial_num_7_wht.pngbin0 -> 3322 bytes
-rw-r--r--res/drawable-xhdpi/dial_num_8_wht.pngbin0 -> 4271 bytes
-rw-r--r--res/drawable-xhdpi/dial_num_9_wht.pngbin0 -> 4525 bytes
-rw-r--r--res/drawable-xhdpi/dial_num_pound_wht.pngbin0 -> 1391 bytes
-rw-r--r--res/drawable-xhdpi/dial_num_star_wht.pngbin0 -> 1402 bytes
-rw-r--r--res/drawable-xhdpi/ic_ab_dialer_holo_dark.pngbin0 -> 2116 bytes
-rw-r--r--res/drawable-xhdpi/ic_call_incoming_holo_dark.pngbin0 -> 662 bytes
-rw-r--r--res/drawable-xhdpi/ic_call_missed_holo_dark.pngbin0 -> 657 bytes
-rw-r--r--res/drawable-xhdpi/ic_call_outgoing_holo_dark.pngbin0 -> 701 bytes
-rw-r--r--res/drawable-xhdpi/ic_call_voicemail_holo_dark.pngbin0 -> 1229 bytes
-rw-r--r--res/drawable-xhdpi/ic_dial_action_call.pngbin0 -> 3629 bytes
-rw-r--r--res/drawable-xhdpi/ic_dial_action_delete.pngbin0 -> 1622 bytes
-rw-r--r--res/drawable-xhdpi/ic_dialer_fork_add_call.pngbin0 -> 3153 bytes
-rw-r--r--res/drawable-xhdpi/ic_dialer_fork_current_call.pngbin0 -> 3591 bytes
-rw-r--r--res/drawable-xhdpi/ic_dialer_fork_tt_keypad.pngbin0 -> 4002 bytes
-rw-r--r--res/drawable-xhdpi/ic_hold_pause_disabled_holo_dark.pngbin0 -> 530 bytes
-rw-r--r--res/drawable-xhdpi/ic_hold_pause_holo_dark.pngbin0 -> 495 bytes
-rw-r--r--res/drawable-xhdpi/ic_play_active_holo_dark.pngbin0 -> 2447 bytes
-rw-r--r--res/drawable-xhdpi/ic_play_disabled_holo_dark.pngbin0 -> 1471 bytes
-rw-r--r--res/drawable-xhdpi/ic_play_holo_dark.pngbin0 -> 1469 bytes
-rw-r--r--res/drawable-xhdpi/ic_sound_off_speakerphone_disabled_holo_dark.pngbin0 -> 1928 bytes
-rw-r--r--res/drawable-xhdpi/ic_sound_off_speakerphone_holo_dark.pngbin0 -> 1983 bytes
-rw-r--r--res/drawable-xhdpi/ic_sound_speakerphone_disabled_holo_dark.pngbin0 -> 2573 bytes
-rw-r--r--res/drawable-xhdpi/ic_sound_speakerphone_holo_dark.pngbin0 -> 2780 bytes
-rw-r--r--res/drawable/btn_call.xml32
-rw-r--r--res/drawable/dialpad_background.xml19
-rw-r--r--res/drawable/ic_hold_pause.xml21
-rw-r--r--res/drawable/ic_play.xml21
-rw-r--r--res/drawable/ic_speakerphone_off.xml20
-rw-r--r--res/drawable/ic_speakerphone_on.xml20
-rw-r--r--res/drawable/ic_tab_dialer.xml20
-rw-r--r--res/drawable/seek_bar_thumb.xml55
-rw-r--r--res/drawable/seekbar_drawable.xml63
-rw-r--r--res/layout/playback_layout.xml133
-rw-r--r--res/menu/call_details_cab.xml22
-rw-r--r--res/menu/call_details_options.xml34
-rw-r--r--res/menu/call_log_options.xml54
-rw-r--r--res/menu/dialpad_options.xml39
-rw-r--r--res/menu/dialtacts_options.xml52
-rw-r--r--res/menu/dialtacts_search_options.xml26
-rw-r--r--res/values/attrs.xml34
-rw-r--r--res/values/dimens.xml53
-rw-r--r--res/values/donottranslate_config.xml37
-rw-r--r--res/values/strings.xml170
-rw-r--r--res/values/styles.xml113
-rw-r--r--src/com/android/dialer/CallDetailActivity.java12
-rw-r--r--src/com/android/dialer/DialtactsActivity.java6
-rw-r--r--src/com/android/dialer/NonPhoneActivity.java4
-rw-r--r--src/com/android/dialer/calllog/CallLogFragment.java10
-rw-r--r--src/com/android/dialer/calllog/IntentProvider.java4
-rw-r--r--src/com/android/dialer/dialpad/DialpadFragment.java10
127 files changed, 1066 insertions, 30 deletions
diff --git a/Android.mk b/Android.mk
index b41c394ee..68bb86a08 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,18 +3,20 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-# This should become ContactsCommon
-contacts_common_dir := ../Contacts
+# all common code should eventually move to ContactsCommon and contacts should be removed
+# as a dependency.
+contacts_dir := ../Contacts
+contacts_common_dir := ../ContactsCommon
-src_dirs := src $(contacts_common_dir)/src
-res_dirs := res $(contacts_common_dir)/res
+src_dirs := src $(contacts_common_dir)/src $(contacts_dir)/src
+res_dirs := res $(contacts_common_dir)/res $(contacts_dir)/res
LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
LOCAL_AAPT_FLAGS := \
--auto-add-overlay \
- --extra-packages com.android.contacts
+ --extra-packages com.android.contacts:com.android.contacts.common
LOCAL_JAVA_LIBRARIES := telephony-common
LOCAL_STATIC_JAVA_LIBRARIES := \
diff --git a/res/drawable-hdpi/btn_call_pressed.png b/res/drawable-hdpi/btn_call_pressed.png
new file mode 100644
index 000000000..6b497a2d0
--- /dev/null
+++ b/res/drawable-hdpi/btn_call_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_background_texture.png b/res/drawable-hdpi/dial_background_texture.png
new file mode 100644
index 000000000..95bec9f53
--- /dev/null
+++ b/res/drawable-hdpi/dial_background_texture.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_0_wht.png b/res/drawable-hdpi/dial_num_0_wht.png
new file mode 100644
index 000000000..c42bf4c76
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_0_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_1_wht.png b/res/drawable-hdpi/dial_num_1_wht.png
new file mode 100644
index 000000000..434fd33cb
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_1_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_2_wht.png b/res/drawable-hdpi/dial_num_2_wht.png
new file mode 100644
index 000000000..2ae20ab39
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_2_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_3_wht.png b/res/drawable-hdpi/dial_num_3_wht.png
new file mode 100644
index 000000000..991d5f3dc
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_3_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_4_wht.png b/res/drawable-hdpi/dial_num_4_wht.png
new file mode 100644
index 000000000..7aad3ef97
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_4_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_5_wht.png b/res/drawable-hdpi/dial_num_5_wht.png
new file mode 100644
index 000000000..42a1d0bb5
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_5_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_6_wht.png b/res/drawable-hdpi/dial_num_6_wht.png
new file mode 100644
index 000000000..b03e0191a
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_6_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_7_wht.png b/res/drawable-hdpi/dial_num_7_wht.png
new file mode 100644
index 000000000..8b72fffd6
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_7_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_8_wht.png b/res/drawable-hdpi/dial_num_8_wht.png
new file mode 100644
index 000000000..822f21a94
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_8_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_9_wht.png b/res/drawable-hdpi/dial_num_9_wht.png
new file mode 100644
index 000000000..2ee944b5d
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_pound_wht.png b/res/drawable-hdpi/dial_num_pound_wht.png
new file mode 100644
index 000000000..e10e57d5b
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_pound_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/dial_num_star_wht.png b/res/drawable-hdpi/dial_num_star_wht.png
new file mode 100644
index 000000000..1dfc111e7
--- /dev/null
+++ b/res/drawable-hdpi/dial_num_star_wht.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_ab_dialer_holo_dark.png b/res/drawable-hdpi/ic_ab_dialer_holo_dark.png
new file mode 100644
index 000000000..5fea91f48
--- /dev/null
+++ b/res/drawable-hdpi/ic_ab_dialer_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_call_incoming_holo_dark.png b/res/drawable-hdpi/ic_call_incoming_holo_dark.png
new file mode 100644
index 000000000..8351f4805
--- /dev/null
+++ b/res/drawable-hdpi/ic_call_incoming_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_call_missed_holo_dark.png b/res/drawable-hdpi/ic_call_missed_holo_dark.png
new file mode 100644
index 000000000..7c17c3010
--- /dev/null
+++ b/res/drawable-hdpi/ic_call_missed_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_call_outgoing_holo_dark.png b/res/drawable-hdpi/ic_call_outgoing_holo_dark.png
new file mode 100644
index 000000000..3b9e0f8a9
--- /dev/null
+++ b/res/drawable-hdpi/ic_call_outgoing_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_call_voicemail_holo_dark.png b/res/drawable-hdpi/ic_call_voicemail_holo_dark.png
new file mode 100644
index 000000000..6d64a36fe
--- /dev/null
+++ b/res/drawable-hdpi/ic_call_voicemail_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_dial_action_call.png b/res/drawable-hdpi/ic_dial_action_call.png
new file mode 100644
index 000000000..ed08eb84c
--- /dev/null
+++ b/res/drawable-hdpi/ic_dial_action_call.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_dial_action_delete.png b/res/drawable-hdpi/ic_dial_action_delete.png
new file mode 100644
index 000000000..0bf8563cc
--- /dev/null
+++ b/res/drawable-hdpi/ic_dial_action_delete.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_dialer_fork_add_call.png b/res/drawable-hdpi/ic_dialer_fork_add_call.png
new file mode 100755
index 000000000..e046996ad
--- /dev/null
+++ b/res/drawable-hdpi/ic_dialer_fork_add_call.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_dialer_fork_current_call.png b/res/drawable-hdpi/ic_dialer_fork_current_call.png
new file mode 100755
index 000000000..6e1a39563
--- /dev/null
+++ b/res/drawable-hdpi/ic_dialer_fork_current_call.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_dialer_fork_tt_keypad.png b/res/drawable-hdpi/ic_dialer_fork_tt_keypad.png
new file mode 100755
index 000000000..6b50da1dc
--- /dev/null
+++ b/res/drawable-hdpi/ic_dialer_fork_tt_keypad.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_hold_pause_disabled_holo_dark.png b/res/drawable-hdpi/ic_hold_pause_disabled_holo_dark.png
new file mode 100644
index 000000000..d21cc10fc
--- /dev/null
+++ b/res/drawable-hdpi/ic_hold_pause_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_hold_pause_holo_dark.png b/res/drawable-hdpi/ic_hold_pause_holo_dark.png
new file mode 100644
index 000000000..ac58ec83f
--- /dev/null
+++ b/res/drawable-hdpi/ic_hold_pause_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_play_active_holo_dark.png b/res/drawable-hdpi/ic_play_active_holo_dark.png
new file mode 100644
index 000000000..179b5a185
--- /dev/null
+++ b/res/drawable-hdpi/ic_play_active_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_play_disabled_holo_dark.png b/res/drawable-hdpi/ic_play_disabled_holo_dark.png
new file mode 100644
index 000000000..e3a3853dc
--- /dev/null
+++ b/res/drawable-hdpi/ic_play_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_play_holo_dark.png b/res/drawable-hdpi/ic_play_holo_dark.png
new file mode 100644
index 000000000..d5fd23597
--- /dev/null
+++ b/res/drawable-hdpi/ic_play_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sound_off_speakerphone_disabled_holo_dark.png b/res/drawable-hdpi/ic_sound_off_speakerphone_disabled_holo_dark.png
new file mode 100644
index 000000000..f1a915484
--- /dev/null
+++ b/res/drawable-hdpi/ic_sound_off_speakerphone_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sound_off_speakerphone_holo_dark.png b/res/drawable-hdpi/ic_sound_off_speakerphone_holo_dark.png
new file mode 100644
index 000000000..6f12d52f9
--- /dev/null
+++ b/res/drawable-hdpi/ic_sound_off_speakerphone_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sound_speakerphone_disabled_holo_dark.png b/res/drawable-hdpi/ic_sound_speakerphone_disabled_holo_dark.png
new file mode 100644
index 000000000..3e0f47ea7
--- /dev/null
+++ b/res/drawable-hdpi/ic_sound_speakerphone_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sound_speakerphone_holo_dark.png b/res/drawable-hdpi/ic_sound_speakerphone_holo_dark.png
new file mode 100644
index 000000000..eadd0cda6
--- /dev/null
+++ b/res/drawable-hdpi/ic_sound_speakerphone_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_call_pressed.png b/res/drawable-mdpi/btn_call_pressed.png
new file mode 100644
index 000000000..637b06aa6
--- /dev/null
+++ b/res/drawable-mdpi/btn_call_pressed.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_background_texture.png b/res/drawable-mdpi/dial_background_texture.png
new file mode 100644
index 000000000..a6d666c23
--- /dev/null
+++ b/res/drawable-mdpi/dial_background_texture.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_0_wht.png b/res/drawable-mdpi/dial_num_0_wht.png
new file mode 100644
index 000000000..e6e295ad1
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_0_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_1_wht.png b/res/drawable-mdpi/dial_num_1_wht.png
new file mode 100644
index 000000000..a640e36e7
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_1_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_2_wht.png b/res/drawable-mdpi/dial_num_2_wht.png
new file mode 100644
index 000000000..e311f4f64
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_2_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_3_wht.png b/res/drawable-mdpi/dial_num_3_wht.png
new file mode 100644
index 000000000..f07324a38
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_3_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_4_wht.png b/res/drawable-mdpi/dial_num_4_wht.png
new file mode 100644
index 000000000..cd8d33c89
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_4_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_5_wht.png b/res/drawable-mdpi/dial_num_5_wht.png
new file mode 100644
index 000000000..a9f27dc3a
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_5_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_6_wht.png b/res/drawable-mdpi/dial_num_6_wht.png
new file mode 100644
index 000000000..2bdf08e51
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_6_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_7_wht.png b/res/drawable-mdpi/dial_num_7_wht.png
new file mode 100644
index 000000000..6c1c599a5
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_7_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_8_wht.png b/res/drawable-mdpi/dial_num_8_wht.png
new file mode 100644
index 000000000..db0694ce1
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_8_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_9_wht.png b/res/drawable-mdpi/dial_num_9_wht.png
new file mode 100644
index 000000000..692fdb06e
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_pound_wht.png b/res/drawable-mdpi/dial_num_pound_wht.png
new file mode 100644
index 000000000..f216d0502
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_pound_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/dial_num_star_wht.png b/res/drawable-mdpi/dial_num_star_wht.png
new file mode 100644
index 000000000..f7e8e9f73
--- /dev/null
+++ b/res/drawable-mdpi/dial_num_star_wht.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_ab_dialer_holo_dark.png b/res/drawable-mdpi/ic_ab_dialer_holo_dark.png
new file mode 100644
index 000000000..c4cf2a1ca
--- /dev/null
+++ b/res/drawable-mdpi/ic_ab_dialer_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_call_incoming_holo_dark.png b/res/drawable-mdpi/ic_call_incoming_holo_dark.png
new file mode 100644
index 000000000..8dcb350bc
--- /dev/null
+++ b/res/drawable-mdpi/ic_call_incoming_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_call_missed_holo_dark.png b/res/drawable-mdpi/ic_call_missed_holo_dark.png
new file mode 100644
index 000000000..af030cf13
--- /dev/null
+++ b/res/drawable-mdpi/ic_call_missed_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_call_outgoing_holo_dark.png b/res/drawable-mdpi/ic_call_outgoing_holo_dark.png
new file mode 100644
index 000000000..38a01b7a6
--- /dev/null
+++ b/res/drawable-mdpi/ic_call_outgoing_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_call_voicemail_holo_dark.png b/res/drawable-mdpi/ic_call_voicemail_holo_dark.png
new file mode 100644
index 000000000..bf6d00689
--- /dev/null
+++ b/res/drawable-mdpi/ic_call_voicemail_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_dial_action_call.png b/res/drawable-mdpi/ic_dial_action_call.png
new file mode 100644
index 000000000..59a68f281
--- /dev/null
+++ b/res/drawable-mdpi/ic_dial_action_call.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_dial_action_delete.png b/res/drawable-mdpi/ic_dial_action_delete.png
new file mode 100644
index 000000000..98341e984
--- /dev/null
+++ b/res/drawable-mdpi/ic_dial_action_delete.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_dialer_fork_add_call.png b/res/drawable-mdpi/ic_dialer_fork_add_call.png
new file mode 100644
index 000000000..5a1555b17
--- /dev/null
+++ b/res/drawable-mdpi/ic_dialer_fork_add_call.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_dialer_fork_current_call.png b/res/drawable-mdpi/ic_dialer_fork_current_call.png
new file mode 100644
index 000000000..1be783ef2
--- /dev/null
+++ b/res/drawable-mdpi/ic_dialer_fork_current_call.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_dialer_fork_tt_keypad.png b/res/drawable-mdpi/ic_dialer_fork_tt_keypad.png
new file mode 100644
index 000000000..4e3dd8232
--- /dev/null
+++ b/res/drawable-mdpi/ic_dialer_fork_tt_keypad.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_hold_pause_disabled_holo_dark.png b/res/drawable-mdpi/ic_hold_pause_disabled_holo_dark.png
new file mode 100644
index 000000000..d8cec2504
--- /dev/null
+++ b/res/drawable-mdpi/ic_hold_pause_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_hold_pause_holo_dark.png b/res/drawable-mdpi/ic_hold_pause_holo_dark.png
new file mode 100644
index 000000000..3efa827cc
--- /dev/null
+++ b/res/drawable-mdpi/ic_hold_pause_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_play_active_holo_dark.png b/res/drawable-mdpi/ic_play_active_holo_dark.png
new file mode 100644
index 000000000..042d8c158
--- /dev/null
+++ b/res/drawable-mdpi/ic_play_active_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_play_disabled_holo_dark.png b/res/drawable-mdpi/ic_play_disabled_holo_dark.png
new file mode 100644
index 000000000..64bed7264
--- /dev/null
+++ b/res/drawable-mdpi/ic_play_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_play_holo_dark.png b/res/drawable-mdpi/ic_play_holo_dark.png
new file mode 100644
index 000000000..a31671d93
--- /dev/null
+++ b/res/drawable-mdpi/ic_play_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sound_off_speakerphone_disabled_holo_dark.png b/res/drawable-mdpi/ic_sound_off_speakerphone_disabled_holo_dark.png
new file mode 100644
index 000000000..0a83d8156
--- /dev/null
+++ b/res/drawable-mdpi/ic_sound_off_speakerphone_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sound_off_speakerphone_holo_dark.png b/res/drawable-mdpi/ic_sound_off_speakerphone_holo_dark.png
new file mode 100644
index 000000000..adaff6052
--- /dev/null
+++ b/res/drawable-mdpi/ic_sound_off_speakerphone_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sound_speakerphone_disabled_holo_dark.png b/res/drawable-mdpi/ic_sound_speakerphone_disabled_holo_dark.png
new file mode 100644
index 000000000..d7227071a
--- /dev/null
+++ b/res/drawable-mdpi/ic_sound_speakerphone_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sound_speakerphone_holo_dark.png b/res/drawable-mdpi/ic_sound_speakerphone_holo_dark.png
new file mode 100644
index 000000000..2b9600b7f
--- /dev/null
+++ b/res/drawable-mdpi/ic_sound_speakerphone_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_call_pressed.png b/res/drawable-xhdpi/btn_call_pressed.png
new file mode 100644
index 000000000..cdf52f88b
--- /dev/null
+++ b/res/drawable-xhdpi/btn_call_pressed.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_background_texture.png b/res/drawable-xhdpi/dial_background_texture.png
new file mode 100644
index 000000000..184049f29
--- /dev/null
+++ b/res/drawable-xhdpi/dial_background_texture.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_0_wht.png b/res/drawable-xhdpi/dial_num_0_wht.png
new file mode 100644
index 000000000..dca0aead9
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_0_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_1_wht.png b/res/drawable-xhdpi/dial_num_1_wht.png
new file mode 100644
index 000000000..d1535c170
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_1_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_2_wht.png b/res/drawable-xhdpi/dial_num_2_wht.png
new file mode 100644
index 000000000..12c4ab9ba
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_2_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_3_wht.png b/res/drawable-xhdpi/dial_num_3_wht.png
new file mode 100644
index 000000000..4353e8a39
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_3_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_4_wht.png b/res/drawable-xhdpi/dial_num_4_wht.png
new file mode 100644
index 000000000..ccee5cce7
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_4_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_5_wht.png b/res/drawable-xhdpi/dial_num_5_wht.png
new file mode 100644
index 000000000..f27f153cd
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_5_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_6_wht.png b/res/drawable-xhdpi/dial_num_6_wht.png
new file mode 100644
index 000000000..8966d13d3
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_6_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_7_wht.png b/res/drawable-xhdpi/dial_num_7_wht.png
new file mode 100644
index 000000000..b01881058
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_7_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_8_wht.png b/res/drawable-xhdpi/dial_num_8_wht.png
new file mode 100644
index 000000000..7c7b4f8db
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_8_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_9_wht.png b/res/drawable-xhdpi/dial_num_9_wht.png
new file mode 100644
index 000000000..23984f03d
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_pound_wht.png b/res/drawable-xhdpi/dial_num_pound_wht.png
new file mode 100644
index 000000000..be21af8d8
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_pound_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/dial_num_star_wht.png b/res/drawable-xhdpi/dial_num_star_wht.png
new file mode 100644
index 000000000..061a4946f
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_star_wht.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_ab_dialer_holo_dark.png b/res/drawable-xhdpi/ic_ab_dialer_holo_dark.png
new file mode 100644
index 000000000..a997643de
--- /dev/null
+++ b/res/drawable-xhdpi/ic_ab_dialer_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_call_incoming_holo_dark.png b/res/drawable-xhdpi/ic_call_incoming_holo_dark.png
new file mode 100644
index 000000000..8eb5f3d8b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_call_incoming_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_call_missed_holo_dark.png b/res/drawable-xhdpi/ic_call_missed_holo_dark.png
new file mode 100644
index 000000000..6d09a4e95
--- /dev/null
+++ b/res/drawable-xhdpi/ic_call_missed_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_call_outgoing_holo_dark.png b/res/drawable-xhdpi/ic_call_outgoing_holo_dark.png
new file mode 100644
index 000000000..636050403
--- /dev/null
+++ b/res/drawable-xhdpi/ic_call_outgoing_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_call_voicemail_holo_dark.png b/res/drawable-xhdpi/ic_call_voicemail_holo_dark.png
new file mode 100644
index 000000000..d9684d1e9
--- /dev/null
+++ b/res/drawable-xhdpi/ic_call_voicemail_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dial_action_call.png b/res/drawable-xhdpi/ic_dial_action_call.png
new file mode 100644
index 000000000..0bd980383
--- /dev/null
+++ b/res/drawable-xhdpi/ic_dial_action_call.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dial_action_delete.png b/res/drawable-xhdpi/ic_dial_action_delete.png
new file mode 100644
index 000000000..989e8b1ab
--- /dev/null
+++ b/res/drawable-xhdpi/ic_dial_action_delete.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dialer_fork_add_call.png b/res/drawable-xhdpi/ic_dialer_fork_add_call.png
new file mode 100644
index 000000000..2c1f81712
--- /dev/null
+++ b/res/drawable-xhdpi/ic_dialer_fork_add_call.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dialer_fork_current_call.png b/res/drawable-xhdpi/ic_dialer_fork_current_call.png
new file mode 100644
index 000000000..b1c400821
--- /dev/null
+++ b/res/drawable-xhdpi/ic_dialer_fork_current_call.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dialer_fork_tt_keypad.png b/res/drawable-xhdpi/ic_dialer_fork_tt_keypad.png
new file mode 100644
index 000000000..ccd8f8a83
--- /dev/null
+++ b/res/drawable-xhdpi/ic_dialer_fork_tt_keypad.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hold_pause_disabled_holo_dark.png b/res/drawable-xhdpi/ic_hold_pause_disabled_holo_dark.png
new file mode 100644
index 000000000..9e1233836
--- /dev/null
+++ b/res/drawable-xhdpi/ic_hold_pause_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hold_pause_holo_dark.png b/res/drawable-xhdpi/ic_hold_pause_holo_dark.png
new file mode 100644
index 000000000..c298ab9f5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_hold_pause_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_play_active_holo_dark.png b/res/drawable-xhdpi/ic_play_active_holo_dark.png
new file mode 100644
index 000000000..20d058378
--- /dev/null
+++ b/res/drawable-xhdpi/ic_play_active_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_play_disabled_holo_dark.png b/res/drawable-xhdpi/ic_play_disabled_holo_dark.png
new file mode 100644
index 000000000..953735160
--- /dev/null
+++ b/res/drawable-xhdpi/ic_play_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_play_holo_dark.png b/res/drawable-xhdpi/ic_play_holo_dark.png
new file mode 100644
index 000000000..afa6bb0e6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_play_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sound_off_speakerphone_disabled_holo_dark.png b/res/drawable-xhdpi/ic_sound_off_speakerphone_disabled_holo_dark.png
new file mode 100644
index 000000000..764ff6560
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sound_off_speakerphone_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sound_off_speakerphone_holo_dark.png b/res/drawable-xhdpi/ic_sound_off_speakerphone_holo_dark.png
new file mode 100644
index 000000000..98a449fde
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sound_off_speakerphone_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sound_speakerphone_disabled_holo_dark.png b/res/drawable-xhdpi/ic_sound_speakerphone_disabled_holo_dark.png
new file mode 100644
index 000000000..b836d49ab
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sound_speakerphone_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sound_speakerphone_holo_dark.png b/res/drawable-xhdpi/ic_sound_speakerphone_holo_dark.png
new file mode 100644
index 000000000..71aad9759
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sound_speakerphone_holo_dark.png
Binary files differ
diff --git a/res/drawable/btn_call.xml b/res/drawable/btn_call.xml
new file mode 100644
index 000000000..abce98313
--- /dev/null
+++ b/res/drawable/btn_call.xml
@@ -0,0 +1,32 @@
+<?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.
+-->
+
+<!-- Background resource for call button in the various dialpads.
+ Almost a copy from framework's item_background_holo_dark.xml, but has different pressed effect
+ -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_window_focused="false" android:drawable="@android:color/transparent" />
+
+ <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
+ <item android:state_focused="true" android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/list_selector_disabled_holo_dark" />
+ <item android:state_focused="true" android:state_enabled="false" android:drawable="@drawable/list_selector_disabled_holo_dark" />
+ <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/btn_call_pressed" />
+ <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/btn_call_pressed" />
+ <item android:state_focused="true" android:drawable="@drawable/list_focused_holo" />
+ <item android:drawable="@android:color/transparent" />
+</selector>
+
diff --git a/res/drawable/dialpad_background.xml b/res/drawable/dialpad_background.xml
new file mode 100644
index 000000000..0e31f5eac
--- /dev/null
+++ b/res/drawable/dialpad_background.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/dial_background_texture"
+ android:tileMode="repeat" />
diff --git a/res/drawable/ic_hold_pause.xml b/res/drawable/ic_hold_pause.xml
new file mode 100644
index 000000000..19902ae67
--- /dev/null
+++ b/res/drawable/ic_hold_pause.xml
@@ -0,0 +1,21 @@
+<?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_hold_pause_disabled_holo_dark" />
+ <item android:drawable="@drawable/ic_hold_pause_holo_dark" />
+</selector>
diff --git a/res/drawable/ic_play.xml b/res/drawable/ic_play.xml
new file mode 100644
index 000000000..1c43a5568
--- /dev/null
+++ b/res/drawable/ic_play.xml
@@ -0,0 +1,21 @@
+<?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_play_disabled_holo_dark" />
+ <item android:drawable="@drawable/ic_play_holo_dark" />
+</selector>
diff --git a/res/drawable/ic_speakerphone_off.xml b/res/drawable/ic_speakerphone_off.xml
new file mode 100644
index 000000000..6a8a0a1ba
--- /dev/null
+++ b/res/drawable/ic_speakerphone_off.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_sound_off_speakerphone_disabled_holo_dark" />
+ <item android:drawable="@drawable/ic_sound_off_speakerphone_holo_dark" />
+</selector>
diff --git a/res/drawable/ic_speakerphone_on.xml b/res/drawable/ic_speakerphone_on.xml
new file mode 100644
index 000000000..4bcd5c614
--- /dev/null
+++ b/res/drawable/ic_speakerphone_on.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_sound_speakerphone_disabled_holo_dark" />
+ <item android:drawable="@drawable/ic_sound_speakerphone_holo_dark" />
+</selector>
diff --git a/res/drawable/ic_tab_dialer.xml b/res/drawable/ic_tab_dialer.xml
new file mode 100644
index 000000000..593d091be
--- /dev/null
+++ b/res/drawable/ic_tab_dialer.xml
@@ -0,0 +1,20 @@
+<?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:drawable="@drawable/ic_ab_dialer_holo_dark" />
+</selector>
+
diff --git a/res/drawable/seek_bar_thumb.xml b/res/drawable/seek_bar_thumb.xml
new file mode 100644
index 000000000..c0cffcc8e
--- /dev/null
+++ b/res/drawable/seek_bar_thumb.xml
@@ -0,0 +1,55 @@
+<?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="true">
+ <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- First item is the outer transparent sphere. -->
+ <item>
+ <shape
+ android:shape="oval"
+ >
+ <size
+ android:width="16dip"
+ android:height="16dip"
+ />
+ <solid
+ android:color="@color/voicemail_playback_seek_bar_yet_to_play"
+ />
+ </shape>
+ </item>
+ <!-- Second item is the inner almost-opaque sphere.
+ Seems to derive its size from the outer, a size element doesn't change anything.
+ Looks like using left, right, top and bottom on the item is best to fix inner sphere. -->
+ <item
+ android:left="3dip"
+ android:right="3dip"
+ android:top="3dip"
+ android:bottom="3dip"
+ >
+ <shape
+ android:shape="oval"
+ >
+ <solid
+ android:color="@color/voicemail_playback_seek_bar_already_played"
+ />
+ </shape>
+ </item>
+ </layer-list>
+ </item>
+
+ <!-- Do not show the thumb when disabled -->
+ <item android:drawable="@android:color/transparent" />
+</selector> \ No newline at end of file
diff --git a/res/drawable/seekbar_drawable.xml b/res/drawable/seekbar_drawable.xml
new file mode 100644
index 000000000..96bbee398
--- /dev/null
+++ b/res/drawable/seekbar_drawable.xml
@@ -0,0 +1,63 @@
+<?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="true">
+ <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@android:id/background">
+ <shape android:shape="line">
+ <stroke
+ android:width="2dip"
+ android:color="@color/voicemail_playback_seek_bar_yet_to_play"
+ />
+ </shape>
+ </item>
+ <!-- I am not defining a secondary progress colour - we don't use it. -->
+ <item android:id="@android:id/progress">
+ <clip>
+ <shape android:shape="line">
+ <stroke
+ android:width="2dip"
+ android:color="@color/voicemail_playback_seek_bar_already_played"
+ />
+ </shape>
+ </clip>
+ </item>
+ </layer-list>
+ </item>
+ <item>
+ <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@android:id/background">
+ <shape android:shape="line">
+ <stroke
+ android:width="2dip"
+ android:color="@color/voicemail_playback_seek_bar_yet_to_play"
+ />
+ </shape>
+ </item>
+ <!-- I am not defining a secondary progress colour - we don't use it. -->
+ <item android:id="@android:id/progress">
+ <clip>
+ <shape android:shape="line">
+ <stroke
+ android:width="2dip"
+ android:color="@color/voicemail_playback_seek_bar_yet_to_play"
+ />
+ </shape>
+ </clip>
+ </item>
+ </layer-list>
+ </item>
+</selector>
diff --git a/res/layout/playback_layout.xml b/res/layout/playback_layout.xml
new file mode 100644
index 000000000..2dfcb4da4
--- /dev/null
+++ b/res/layout/playback_layout.xml
@@ -0,0 +1,133 @@
+<?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:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/voicemail_playback_ui_background"
+>
+ <!-- Mute, playback, trash buttons. -->
+ <LinearLayout
+ android:id="@+id/buttons_linear_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_alignParentTop="true"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="58dip"
+ android:layout_marginRight="@dimen/call_detail_button_spacing"
+ android:background="@drawable/dialpad_background"
+ android:layout_weight="1"
+ >
+ <ImageButton
+ android:id="@+id/playback_start_stop"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?android:attr/selectableItemBackground"
+ android:src="@drawable/ic_hold_pause"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="58dip"
+ android:background="@drawable/dialpad_background"
+ android:layout_weight="1"
+ >
+ <ImageButton
+ android:id="@+id/playback_speakerphone"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?android:attr/selectableItemBackground"
+ android:src="@drawable/ic_speakerphone_on"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <RelativeLayout
+ android:id="@+id/seek_container"
+ android:layout_width="match_parent"
+ android:layout_height="80dip"
+ android:background="@drawable/dialpad_background"
+ android:layout_below="@id/buttons_linear_layout"
+ android:layout_marginTop="@dimen/call_detail_button_spacing"
+ >
+ <!-- SeekBar left-right margin decreased from redlines 72dip by 8dip to account for
+ half thumb width (thumb is 16dip).
+ Vertically, SeekBar and rate buttons should be below centre, position achieved by
+ making them centred but giving a difference between top and bottom padding,
+ difference is currently 10dip. -->
+ <SeekBar
+ android:id="@+id/playback_seek"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:progressDrawable="@drawable/seekbar_drawable"
+ android:thumb="@drawable/seek_bar_thumb"
+ android:thumbOffset="8dip"
+ android:progress="0"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip"
+ android:paddingTop="30dip"
+ android:paddingBottom="20dip"
+ android:layout_marginRight="64dip"
+ android:layout_marginLeft="64dip"
+ android:max="0"
+ android:layout_centerVertical="true"
+ />
+ <TextView
+ android:id="@+id/playback_position_text"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:textSize="14sp"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="10dip"
+ />
+ <TextView
+ android:id="@+id/playback_speed_text"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:textSize="14sp"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="10dip"
+ android:alpha="0"
+ />
+ <ImageButton
+ android:id="@+id/rate_decrease_button"
+ android:src="@drawable/ic_minus"
+ android:layout_width="64dip"
+ android:layout_height="wrap_content"
+ android:background="?android:attr/selectableItemBackground"
+ android:paddingBottom="19dip"
+ android:paddingTop="29dip"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ />
+ <ImageButton
+ android:id="@+id/rate_increase_button"
+ android:src="@drawable/ic_plus"
+ android:layout_width="64dip"
+ android:layout_height="wrap_content"
+ android:background="?android:attr/selectableItemBackground"
+ android:paddingBottom="19dip"
+ android:paddingTop="29dip"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ />
+ </RelativeLayout>
+</RelativeLayout>
diff --git a/res/menu/call_details_cab.xml b/res/menu/call_details_cab.xml
new file mode 100644
index 000000000..7de675ff1
--- /dev/null
+++ b/res/menu/call_details_cab.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:id="@+id/copy_phone_number"
+ android:icon="?android:attr/actionModeCopyDrawable"
+ android:title="@string/menu_copy"
+ />
+</menu>
diff --git a/res/menu/call_details_options.xml b/res/menu/call_details_options.xml
new file mode 100644
index 000000000..63ce8f5db
--- /dev/null
+++ b/res/menu/call_details_options.xml
@@ -0,0 +1,34 @@
+<?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_trash"
+ android:icon="@drawable/ic_trash_holo_dark"
+ android:showAsAction="ifRoom"
+ android:title="@string/recentCalls_trashVoicemail"
+ android:onClick="onMenuTrashVoicemail"
+ />
+ <item
+ android:id="@+id/menu_remove_from_call_log"
+ android:title="@string/recentCalls_removeFromRecentList"
+ android:onClick="onMenuRemoveFromCallLog"
+ />
+ <item
+ android:id="@+id/menu_edit_number_before_call"
+ android:title="@string/recentCalls_editNumberBeforeCall"
+ android:onClick="onMenuEditNumberBeforeCall"
+ />
+</menu>
diff --git a/res/menu/call_log_options.xml b/res/menu/call_log_options.xml
new file mode 100644
index 000000000..bf2973f6c
--- /dev/null
+++ b/res/menu/call_log_options.xml
@@ -0,0 +1,54 @@
+<?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/show_all_calls"
+ android:title="@string/menu_show_all_calls"
+ android:showAsAction="never"
+ android:orderInCategory="1"/>
+
+ <item
+ android:id="@+id/show_voicemails_only"
+ android:title="@string/menu_show_voicemails_only"
+ android:showAsAction="never"
+ android:orderInCategory="1"/>
+
+ <item
+ android:id="@+id/show_missed_only"
+ android:title="@string/menu_show_missed_only"
+ android:showAsAction="never"
+ android:orderInCategory="1"/>
+
+ <item
+ android:id="@+id/show_outgoing_only"
+ android:title="@string/menu_show_outgoing_only"
+ android:showAsAction="never"
+ android:orderInCategory="1"/>
+
+ <item
+ android:id="@+id/show_incoming_only"
+ android:title="@string/menu_show_incoming_only"
+ android:showAsAction="never"
+ android:orderInCategory="1"/>
+
+
+ <item
+ android:id="@+id/delete_all"
+ android:title="@string/recentCalls_deleteAll"
+ android:showAsAction="never"
+ android:orderInCategory="1"/>
+</menu>
diff --git a/res/menu/dialpad_options.xml b/res/menu/dialpad_options.xml
new file mode 100644
index 000000000..6dda8fc9a
--- /dev/null
+++ b/res/menu/dialpad_options.xml
@@ -0,0 +1,39 @@
+<?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_add_contacts"
+ android:title="@string/recentCalls_addToContact"
+ android:showAsAction="withText"
+ android:orderInCategory="1" />
+ <item
+ android:id="@+id/menu_2s_pause"
+ android:title="@string/add_2sec_pause"
+ android:showAsAction="withText"
+ android:orderInCategory="1" />
+
+ <item
+ android:id="@+id/menu_add_wait"
+ android:title="@string/add_wait"
+ android:showAsAction="withText"
+ android:orderInCategory="1" />
+
+ <item
+ android:id="@+id/menu_call_settings_dialpad"
+ android:title="@string/call_settings"
+ android:showAsAction="withText"
+ android:orderInCategory="1" />
+</menu>
diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml
new file mode 100644
index 000000000..8eaa91552
--- /dev/null
+++ b/res/menu/dialtacts_options.xml
@@ -0,0 +1,52 @@
+<?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/search_on_action_bar"
+ android:title="@string/menu_search"
+ android:icon="@drawable/ic_dial_action_search"
+ android:showAsAction="ifRoom" />
+
+ <!-- This should come after the other menus in CallLog and Dialpad -->
+ <item
+ android:id="@+id/menu_call_settings"
+ android:title="@string/call_settings"
+ android:showAsAction="withText"
+ android:orderInCategory="2" />
+
+ <item
+ android:id="@+id/filter_option"
+ android:title="@string/menu_contacts_filter"
+ android:showAsAction="withText" />
+
+ <item
+ android:id="@+id/add_contact"
+ android:icon="@drawable/ic_add_contact_holo_dark"
+ android:title="@string/menu_newContact"
+ android:showAsAction="ifRoom" />
+
+ <!-- Ugly hack: empty item never clickable.
+ This is for forcing search icon on left even when there's a single item
+ in the bottom ActionBar.
+ We intentionally don't use android:icon to avoid other issues around item with
+ a null icon.
+
+ TODO: look for better idea. -->
+ <item
+ android:id="@+id/empty_right_menu_item"
+ android:actionLayout="@layout/empty2"
+ android:showAsAction="ifRoom" />
+</menu>
diff --git a/res/menu/dialtacts_search_options.xml b/res/menu/dialtacts_search_options.xml
new file mode 100644
index 000000000..0979ebbcf
--- /dev/null
+++ b/res/menu/dialtacts_search_options.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.
+-->
+<!-- Used with DialtactsActivity's search mode. -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:id="@+id/filter_option"
+ android:title="@string/menu_contacts_filter"
+ android:showAsAction="withText" />
+ <item
+ android:id="@+id/add_contact"
+ android:title="@string/menu_newContact"
+ android:showAsAction="withText" />
+</menu>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
new file mode 100644
index 000000000..f734aae89
--- /dev/null
+++ b/res/values/attrs.xml
@@ -0,0 +1,34 @@
+<?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
+ -->
+<resources>
+
+ <declare-styleable name="CallLog">
+ <attr name="call_log_primary_text_color" format="color" />
+ <attr name="call_log_primary_background_color" format="color" />
+ <attr name="call_log_secondary_text_color" format="color" />
+ <attr name="call_log_secondary_background_color" format="color" />
+ <attr name="call_log_header_color" format="color" />
+ </declare-styleable>
+
+ <declare-styleable name="VoicemailStatus">
+ <attr name="call_log_voicemail_status_height" format="dimension" />
+ <attr name="call_log_voicemail_status_background_color" format="color" />
+ <attr name="call_log_voicemail_status_text_color" format="color" />
+ <attr name="call_log_voicemail_status_action_text_color" format="color" />
+ </declare-styleable>
+
+</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
new file mode 100644
index 000000000..2c8d59662
--- /dev/null
+++ b/res/values/dimens.xml
@@ -0,0 +1,53 @@
+<?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
+ -->
+<resources>
+
+ <!-- Height of edit text in dialpad fragment -->
+ <dimen name="dialpad_horizontal_margin">0dip</dimen>
+ <dimen name="dialpad_vertical_margin">2dip</dimen>
+ <dimen name="dialpad_digits_text_size">35sp</dimen>
+
+ <!-- Just used in landscape mode -->
+ <dimen name="dialpad_digits_height">0px</dimen>
+ <dimen name="dialpad_digits_margin_bottom">0px</dimen>
+ <dimen name="dialpad_center_margin">3dp</dimen>
+ <dimen name="dialpad_button_margin">2dp</dimen>
+ <!-- Match call_button_height to Phone's dimens/in_call_end_button_height -->
+ <dimen name="call_button_height">74dp</dimen>
+
+ <!-- Call Log -->
+ <dimen name="call_log_call_action_size">32dip</dimen>
+ <dimen name="call_log_call_action_width">48dip</dimen>
+ <dimen name="call_log_icon_margin">4dip</dimen>
+ <dimen name="call_log_inner_margin">8dip</dimen>
+ <dimen name="call_log_outer_margin">16dip</dimen>
+ <dimen name="call_log_indent_margin">24dip</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>
+ <dimen name="call_detail_button_spacing">2dip</dimen>
+
+ <!-- Layout weight values for dialpad screen. These layouts will be used in one
+ LinearLayout (dialpad_fragment.xml), configuring dialpad screen's vertical
+ ratio. -->
+ <integer name="dialpad_layout_weight_digits">20</integer>
+ <integer name="dialpad_layout_weight_dialpad">65</integer>
+ <integer name="dialpad_layout_weight_additional_buttons">15</integer>
+
+ <!-- Min with of fake menu buttons, which should be same as ActionBar's one -->
+ <dimen name="fake_menu_button_min_width">56dip</dimen>
+</resources>
diff --git a/res/values/donottranslate_config.xml b/res/values/donottranslate_config.xml
new file mode 100644
index 000000000..468e41586
--- /dev/null
+++ b/res/values/donottranslate_config.xml
@@ -0,0 +1,37 @@
+<?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
+ -->
+
+<resources>
+
+ <!-- If true, enable vibration (haptic feedback) for dialer key presses.
+ The pattern is set on a per-platform basis using config_virtualKeyVibePattern.
+ TODO: If enough users are annoyed by this, we might eventually
+ need to make it a user preference rather than a per-platform
+ resource. -->
+ <bool name="config_enable_dialer_key_vibration">true</bool>
+
+ <!-- If true, show an onscreen "Dial" button in the dialer.
+ In practice this is used on all platforms even the ones with hard SEND/END
+ keys, but for maximum flexibility it's controlled by a flag here
+ (which can be overridden on a per-product basis.) -->
+ <bool name="config_show_onscreen_dial_button">true</bool>
+
+ <!-- Regular expression for prohibiting certain phone numbers in dialpad.
+ Ignored if empty. -->
+ <string name="config_prohibited_phone_number_regexp"></string>
+
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2daa236ed..0b3870847 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -16,12 +16,178 @@
-->
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Directory partition name -->
<string name="applicationLabel">Dialer</string>
<!-- Title for the activity that dials the phone. This is the name
- used in the Launcher icon. -->
+ used in the Launcher icon. -->
<string name="launcherDialer">Phone</string>
+ <!-- The description text for the dialer tab.
+
+ 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="dialerIconLabel">Phone</string>
+
+ <!-- The description text for the call log tab.
+
+ 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="recentCallsIconLabel">Call log</string>
+
+ <!-- Menu item used to send an SMS or MMS message to a phone number -->
+ <string name="menu_sendTextMessage">Send text message</string>
+
+ <!-- Menu item used to call a contact from the call log -->
+ <string name="recentCalls_callNumber">Call
+ <xliff:g id="name">%s</xliff:g>
+ </string>
+
+ <!-- Menu item used to copy a number from the call log to the dialer so it can be edited before calling it -->
+ <string name="recentCalls_editNumberBeforeCall">Edit number before call</string>
+
+ <!-- Menu item used to add a number from the call log to contacts -->
+ <string name="recentCalls_addToContact">Add to contacts</string>
+
+ <!-- Menu item used to remove a single call from the call log -->
+ <string name="recentCalls_removeFromRecentList">Remove from call log</string>
+
+ <!-- Menu item used to remove all calls from the call log -->
+ <string name="recentCalls_deleteAll">Clear call log</string>
+
+ <!-- Menu item used to delete a voicemail. [CHAR LIMIT=30] -->
+ <string name="recentCalls_trashVoicemail">Delete voicemail</string>
+
+ <!-- Menu item used to share a voicemail. [CHAR LIMIT=30] -->
+ <string name="recentCalls_shareVoicemail">Share voicemail</string>
+
+ <!-- Text displayed when the call log is empty -->
+ <string name="recentCalls_empty">Call log is empty.</string>
+
+ <!-- Title of the confirmation dialog for clearing the call log. [CHAR LIMIT=37] -->
+ <string name="clearCallLogConfirmation_title">Clear call log?</string>
+
+ <!-- Confirmation dialog for clearing the call log. [CHAR LIMIT=NONE] -->
+ <string name="clearCallLogConfirmation">All your call records will be deleted.</string>
+
+ <!-- Title of the "Clearing call log" progress-dialog [CHAR LIMIT=35] -->
+ <string name="clearCallLogProgress_title">Clearing call log\u2026</string>
+
+ <!-- Title of the confirmation dialog for clearing frequents. [CHAR LIMIT=37] -->
+ <string name="clearFrequentsConfirmation_title">Clear frequently contacted?</string>
+
+ <!-- Confirmation dialog for clearing frequents. [CHAR LIMIT=NONE] -->
+ <string name="clearFrequentsConfirmation">You\'ll clear the frequently contacted list in the
+ People and Phone apps, and force email apps to learn your addressing preferences from
+ scratch.
+ </string>
+
+ <!-- Title of the "Clearing frequently contacted" progress-dialog [CHAR LIMIT=35] -->
+ <string name="clearFrequentsProgress_title">Clearing frequently contacted\u2026</string>
+
+ <!-- Title of the notification of new voicemails. [CHAR LIMIT=30] -->
+ <plurals name="notification_voicemail_title">
+ <item quantity="one">Voicemail</item>
+ <item quantity="other">
+ <xliff:g id="count">%1$d</xliff:g>
+ Voicemails
+ </item>
+ </plurals>
+
+ <!-- Used in the notification of a new voicemail for the action to play the voicemail. -->
+ <string name="notification_action_voicemail_play">Play</string>
+
+ <!-- Used to build a list of names or phone numbers, to indicate the callers who left
+ voicemails.
+ The first argument may be one or more callers, the most recent ones.
+ The second argument is an additional callers.
+ This string is used to build a list of callers.
+
+ [CHAR LIMIT=10]
+ -->
+ <string name="notification_voicemail_callers_list"><xliff:g id="newer_callers">%1$s</xliff:g>,
+ <xliff:g id="older_caller">%2$s</xliff:g>
+ </string>
+
+ <!-- Text used in the ticker to notify the user of the latest voicemail. [CHAR LIMIT=30] -->
+ <string name="notification_new_voicemail_ticker">New voicemail from
+ <xliff:g id="caller">%1$s</xliff:g>
+ </string>
+
+ <!-- Message to show when there is an error playing back the voicemail. [CHAR LIMIT=40] -->
+ <string name="voicemail_playback_error">Couldn\'t play voicemail.</string>
+
+ <!-- Message to display before we have prepared the media player, i.e. before we know duration. [CHAR LIMIT=40] -->
+ <string name="voicemail_buffering">Buffering\u2026</string>
+
+ <!-- Message to display whilst we are waiting for the content to be fetched. [CHAR LIMIT=40] -->
+ <string name="voicemail_fetching_content">Fetching voicemail\u2026</string>
+
+ <!-- Message to display if we fail to get content within a suitable time period. [CHAR LIMIT=40] -->
+ <string name="voicemail_fetching_timout">Couldn\'t fetch voicemail.</string>
+
+ <!-- The header in the call log used to identify missed calls and voicemail that have not yet been consumed [CHAR LIMIT=10] -->
+ <string name="call_log_new_header">New</string>
+
+ <!-- The header in the call log used to identify items that have been already consumed [CHAR LIMIT=10] -->
+ <string name="call_log_old_header">Older</string>
+
+ <!-- The header to show that call log is only showing voicemail calls. [CHAR LIMIT=40] -->
+ <string name="call_log_voicemail_header">Calls with voicemail</string>
+
+ <!-- The header to show that call log is only showing incoming calls. [CHAR LIMIT=40] -->
+ <string name="call_log_incoming_header">Incoming calls</string>
+
+ <!-- The header to show that call log is only showing outgoing calls. [CHAR LIMIT=40] -->
+ <string name="call_log_outgoing_header">Outgoing calls</string>
+
+ <!-- The header to show that call log is only showing missed calls. [CHAR LIMIT=40] -->
+ <string name="call_log_missed_header">Missed calls</string>
+
+ <!-- Voicemail status message shown at the top of call log to notify the user that no new
+ voicemails are currently available. This can happen when both notification as well as data
+ connection to the voicemail server is lost. [CHAR LIMIT=64] -->
+ <string name="voicemail_status_voicemail_not_available">Can\'t connect to voicemail server.
+ </string>
+ <!-- Voicemail status message shown at the top of call log to notify the user that there is no
+ data connection to the voicemail server, but there are new voicemails waiting on the server.
+ [CHAR LIMIT=64] -->
+ <string name="voicemail_status_messages_waiting">Can\'t connect to voicemail server. New
+ voicemails are waiting.
+ </string>
+ <!-- Voicemail status message shown at the top of call log to invite the user to configure
+ visual voicemail. [CHAR LIMIT=64] -->
+ <string name="voicemail_status_configure_voicemail">Set up your voicemail.</string>
+ <!-- Voicemail status message shown at the top of call details screen to notify the user that
+ the audio of this voicemail is not available. [CHAR LIMIT=64] -->
+ <string name="voicemail_status_audio_not_available">Audio not available.</string>
+
+ <!-- User action prompt shown next to a voicemail status message to let the user configure
+ visual voicemail. [CHAR LIMIT=20] -->
+ <string name="voicemail_status_action_configure">Set up</string>
+ <!-- User action prompt shown next to a voicemail status message to let the user call voicemail
+ server directly to listen to the voicemails. [CHAR LIMIT=20] -->
+ <string name="voicemail_status_action_call_server">Call voicemail</string>
+
+ <!-- The slowest voicemail playback speed. [CHAR LIMIT=30] -->
+ <string name="voicemail_speed_slowest">Slowest speed</string>
+ <!-- Slower than normal voicemail playback speed. [CHAR LIMIT=30] -->
+ <string name="voicemail_speed_slower">Slow speed</string>
+ <!-- Normal voicemail playback speed. [CHAR LIMIT=30] -->
+ <string name="voicemail_speed_normal">Normal speed</string>
+ <!-- Faster than normal pvoicemail playback speed. [CHAR LIMIT=30] -->
+ <string name="voicemail_speed_faster">Fast speed</string>
+ <!-- Fastest voicemail playback speed. [CHAR LIMIT=30] -->
+ <string name="voicemail_speed_fastest">Fastest speed</string>
+
+ <!-- The counter for calls in a group and the date of the latest call as shown in the call log [CHAR LIMIT=15] -->
+ <string name="call_log_item_count_and_date">(<xliff:g id="count">%1$d</xliff:g>)
+ <xliff:g id="date">%2$s</xliff:g>
+ </string>
+
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
new file mode 100644
index 000000000..93a8176d9
--- /dev/null
+++ b/res/values/styles.xml
@@ -0,0 +1,113 @@
+<?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
+ -->
+<resources>
+ <style name="DialtactsTheme"
+ parent="android:Theme.Holo">
+ <item name="android:textColorSecondary">@color/dialtacts_secondary_text_color</item>
+ <item name="android:windowActionBarOverlay">true</item>
+ <item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item>
+ <item name="android:windowContentOverlay">@null</item>
+ <item name="android:windowBackground">@drawable/background_dial_holo_dark</item>
+ <item name="android:listViewStyle">@style/ListViewStyle</item>
+ <item name="activated_background">@drawable/list_item_activated_background</item>
+ <item name="section_header_background">@drawable/list_title_holo</item>
+ <item name="list_section_header_height">32dip</item>
+ <item name="list_item_divider">?android:attr/listDivider</item>
+ <item name="list_item_padding_top">0dip</item>
+ <item name="list_item_padding_right">0dip</item>
+ <item name="list_item_padding_bottom">0dip</item>
+ <item name="list_item_padding_left">0dip</item>
+ <item name="list_item_gap_between_image_and_text">8dip</item>
+ <item name="list_item_gap_between_label_and_data">5dip</item>
+ <item name="list_item_presence_icon_margin">4dip</item>
+ <item name="list_item_presence_icon_size">16dip</item>
+ <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>
+ <item name="list_item_profile_photo_size">70dip</item>
+ <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>
+ <item name="list_item_header_text_indent">8dip</item>
+ <item name="list_item_header_text_color">@color/people_app_theme_color</item>
+ <item name="list_item_header_text_size">14sp</item>
+ <item name="list_item_header_height">24dip</item>
+ <item name="list_item_header_underline_height">1dip</item>
+ <item name="list_item_header_underline_color">@color/people_app_theme_color</item>
+ <item name="list_item_data_width_weight">5</item>
+ <item name="list_item_label_width_weight">3</item>
+ <item name="contact_browser_list_padding_left">16dip</item>
+ <item name="contact_browser_list_padding_right">0dip</item>
+ <item name="contact_browser_background">@android:color/transparent</item>
+ <item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
+ <!-- CallLog -->
+ <item name="call_log_primary_text_color">#FFFFFF</item>
+ <item name="call_log_primary_background_color">#000000</item>
+ <item name="call_log_secondary_text_color">#888888</item>
+ <item name="call_log_secondary_background_color">#333333</item>
+ <item name="call_log_header_color">#33b5e5</item>
+ <!-- VoicemailStatus -->
+ <item name="call_log_voicemail_status_height">48dip</item>
+ <item name="call_log_voicemail_status_background_color">#262626</item>
+ <item name="call_log_voicemail_status_text_color">#888888</item>
+ <item name="call_log_voicemail_status_action_text_color">#33b5e5</item>
+ <!-- Favorites -->
+ <item name="favorites_padding_bottom">?android:attr/actionBarSize</item>
+ </style>
+
+ <style name="CallDetailActivityTheme" parent="android:Theme.Holo">
+ <item name="android:windowBackground">@android:color/black</item>
+ <item name="android:gravity">top</item>
+ <item name="android:listViewStyle">@style/ListViewStyle</item>
+ <!-- CallLog -->
+ <item name="call_log_primary_text_color">#FFFFFF</item>
+ <item name="call_log_primary_background_color">#000000</item>
+ <item name="call_log_secondary_text_color">#FFFFFF</item>
+ <item name="call_log_secondary_background_color">#333333</item>
+ <item name="call_log_header_color">#33b5e5</item>
+ <!-- VoicemailStatus -->
+ <item name="call_log_voicemail_status_height">48dip</item>
+ <item name="call_log_voicemail_status_background_color">#262626</item>
+ <item name="call_log_voicemail_status_text_color">#888888</item>
+ <item name="call_log_voicemail_status_action_text_color">#33b5e5</item>
+ </style>
+
+ <style name="Theme">
+ </style>
+
+ <style name="DialtactsDigitsTextAppearance">
+ <item name="android:maxLines">1</item>
+ <item name="android:scrollHorizontally">true</item>
+ <item name="android:textSize">@dimen/dialpad_digits_text_size</item>
+ <item name="android:freezesText">true</item>
+ <item name="android:focusableInTouchMode">true</item>
+ <item name="android:editable">true</item>
+ <item name="android:cursorVisible">false</item>
+ <item name="android:layout_weight">0</item>
+ </style>
+
+ <style name="DialtactsDialpadButtonStyle">
+ <item name="android:layout_width">0dip</item>
+ <item name="android:layout_height">match_parent</item>
+ <item name="android:layout_weight">1</item>
+ <item name="android:background">?android:attr/selectableItemBackground</item>
+ <item name="android:soundEffectsEnabled">false</item>
+ </style>
+
+ <style name="DialtactsActionBarStyle" parent="android:Widget.Holo.ActionBar">
+ <item name="android:backgroundSplit">@null</item>
+ <item name="android:backgroundStacked">@drawable/ab_stacked_opaque_dark_holo</item>
+ <item name="android:displayOptions"></item>
+ </style>
+
+</resources>
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java
index cb1437d4a..56d4f9ccb 100644
--- a/src/com/android/dialer/CallDetailActivity.java
+++ b/src/com/android/dialer/CallDetailActivity.java
@@ -51,12 +51,12 @@ import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
+import com.android.contacts.common.CallUtil;
import com.android.contacts.ContactPhotoManager;
import com.android.contacts.ContactsUtils;
import com.android.contacts.R;
import com.android.contacts.format.FormatUtils;
-import com.android.contacts.util.ClipboardUtils;
-import com.android.contacts.util.Constants;
+import com.android.contacts.common.ClipboardUtils;
import com.android.dialer.BackScrollManager.ScrollableHeader;
import com.android.dialer.calllog.CallDetailHistoryAdapter;
import com.android.dialer.calllog.CallTypeHelper;
@@ -371,8 +371,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
TelephonyManager tm = (TelephonyManager)
getSystemService(Context.TELEPHONY_SERVICE);
if (tm.getCallState() == TelephonyManager.CALL_STATE_IDLE) {
- startActivity(ContactsUtils.getCallIntent(
- Uri.fromParts(Constants.SCHEME_TEL, mNumber, null)));
+ startActivity(CallUtil.getCallIntent(
+ Uri.fromParts(CallUtil.SCHEME_TEL, mNumber, null)));
return true;
}
}
@@ -513,7 +513,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
ViewEntry entry = new ViewEntry(
getString(R.string.menu_callNumber,
FormatUtils.forceLeftToRight(displayNumber)),
- ContactsUtils.getCallIntent(mNumber),
+ CallUtil.getCallIntent(mNumber),
getString(R.string.description_call, nameOrNumber));
// Only show a label if the number is shown and it is not a SIP address.
@@ -820,7 +820,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
}
public void onMenuEditNumberBeforeCall(MenuItem menuItem) {
- startActivity(new Intent(Intent.ACTION_DIAL, ContactsUtils.getCallUri(mNumber)));
+ startActivity(new Intent(Intent.ACTION_DIAL, CallUtil.getCallUri(mNumber)));
}
public void onMenuTrashVoicemail(MenuItem menuItem) {
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 841db1c90..c49e05b31 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -56,6 +56,7 @@ import android.widget.SearchView;
import android.widget.SearchView.OnCloseListener;
import android.widget.SearchView.OnQueryTextListener;
+import com.android.contacts.common.CallUtil;
import com.android.contacts.ContactsUtils;
import com.android.contacts.R;
import com.android.contacts.activities.TransactionSafeActivity;
@@ -66,7 +67,6 @@ import com.android.contacts.list.ContactListItemView;
import com.android.contacts.list.OnPhoneNumberPickerActionListener;
import com.android.contacts.list.PhoneNumberPickerFragment;
import com.android.contacts.util.AccountFilterUtil;
-import com.android.contacts.util.Constants;
import com.android.dialer.calllog.CallLogFragment;
import com.android.dialer.dialpad.DialpadFragment;
import com.android.dialer.list.PhoneFavoriteFragment;
@@ -852,7 +852,7 @@ public class DialtactsActivity extends TransactionSafeActivity
}
if (Intent.ACTION_VIEW.equals(action)) {
final Uri data = intent.getData();
- if (data != null && Constants.SCHEME_TEL.equals(data.getScheme())) {
+ if (data != null && CallUtil.SCHEME_TEL.equals(data.getScheme())) {
return true;
}
}
@@ -926,7 +926,7 @@ public class DialtactsActivity extends TransactionSafeActivity
@Override
public void onCallNumberDirectly(String phoneNumber) {
- Intent intent = ContactsUtils.getCallIntent(phoneNumber, getCallOrigin());
+ Intent intent = CallUtil.getCallIntent(phoneNumber, getCallOrigin());
startActivity(intent);
}
};
diff --git a/src/com/android/dialer/NonPhoneActivity.java b/src/com/android/dialer/NonPhoneActivity.java
index c7a744e4a..101bd58ea 100644
--- a/src/com/android/dialer/NonPhoneActivity.java
+++ b/src/com/android/dialer/NonPhoneActivity.java
@@ -29,9 +29,9 @@ import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Intents.Insert;
import android.text.TextUtils;
+import com.android.contacts.common.CallUtil;
import com.android.contacts.ContactsActivity;
import com.android.contacts.R;
-import com.android.contacts.util.Constants;
/**
* Activity that intercepts DIAL and VIEW intents for phone numbers for devices that can not
@@ -62,7 +62,7 @@ public class NonPhoneActivity extends ContactsActivity {
final Uri data = getIntent().getData();
if (data == null) return null;
final String scheme = data.getScheme();
- if (!Constants.SCHEME_TEL.equals(scheme)) return null;
+ if (!CallUtil.SCHEME_TEL.equals(scheme)) return null;
return getIntent().getData().getSchemeSpecificPart();
}
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index 83ed830ad..1aa96fd6d 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -46,9 +46,9 @@ import android.widget.ListView;
import android.widget.TextView;
import com.android.common.io.MoreCloseables;
+import com.android.contacts.common.CallUtil;
import com.android.contacts.ContactsUtils;
import com.android.contacts.R;
-import com.android.contacts.util.Constants;
import com.android.dialer.util.EmptyLoader;
import com.android.dialer.voicemail.VoicemailStatusHelper;
import com.android.dialer.voicemail.VoicemailStatusHelper.StatusMessage;
@@ -444,8 +444,8 @@ public class CallLogFragment extends ListFragment
Intent intent;
// If "number" is really a SIP address, construct a sip: URI.
if (PhoneNumberUtils.isUriNumber(number)) {
- intent = ContactsUtils.getCallIntent(
- Uri.fromParts(Constants.SCHEME_SIP, number, null));
+ intent = CallUtil.getCallIntent(
+ Uri.fromParts(CallUtil.SCHEME_SIP, number, null));
} else {
// We're calling a regular PSTN phone number.
// Construct a tel: URI, but do some other possible cleanup first.
@@ -457,8 +457,8 @@ public class CallLogFragment extends ListFragment
String countryIso = cursor.getString(CallLogQuery.COUNTRY_ISO);
number = mAdapter.getBetterNumberFromContacts(number, countryIso);
}
- intent = ContactsUtils.getCallIntent(
- Uri.fromParts(Constants.SCHEME_TEL, number, null));
+ intent = CallUtil.getCallIntent(
+ Uri.fromParts(CallUtil.SCHEME_TEL, number, null));
}
intent.setFlags(
Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
diff --git a/src/com/android/dialer/calllog/IntentProvider.java b/src/com/android/dialer/calllog/IntentProvider.java
index 859487a26..6fc8933f9 100644
--- a/src/com/android/dialer/calllog/IntentProvider.java
+++ b/src/com/android/dialer/calllog/IntentProvider.java
@@ -23,7 +23,7 @@ import android.database.Cursor;
import android.net.Uri;
import android.provider.CallLog.Calls;
-import com.android.contacts.ContactsUtils;
+import com.android.contacts.common.CallUtil;
import com.android.dialer.CallDetailActivity;
/**
@@ -38,7 +38,7 @@ public abstract class IntentProvider {
return new IntentProvider() {
@Override
public Intent getIntent(Context context) {
- return ContactsUtils.getCallIntent(number);
+ return CallUtil.getCallIntent(number);
}
};
}
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 77b7c070d..7aa5a9ef4 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -67,9 +67,9 @@ import android.widget.ListView;
import android.widget.PopupMenu;
import android.widget.TextView;
+import com.android.contacts.common.CallUtil;
import com.android.contacts.ContactsUtils;
import com.android.contacts.R;
-import com.android.contacts.util.Constants;
import com.android.contacts.util.PhoneNumberFormatter;
import com.android.contacts.util.StopWatch;
import com.android.dialer.DialtactsActivity;
@@ -344,7 +344,7 @@ public class DialpadFragment extends Fragment
if (Intent.ACTION_DIAL.equals(action) || Intent.ACTION_VIEW.equals(action)) {
Uri uri = intent.getData();
if (uri != null) {
- if (Constants.SCHEME_TEL.equals(uri.getScheme())) {
+ if (CallUtil.SCHEME_TEL.equals(uri.getScheme())) {
// Put the requested number into the input area
String data = uri.getSchemeSpecificPart();
// Remember it is filled via Intent.
@@ -1094,9 +1094,9 @@ public class DialpadFragment extends Fragment
// Clear the digits just in case.
mDigits.getText().clear();
} else {
- final Intent intent = ContactsUtils.getCallIntent(number,
+ final Intent intent = CallUtil.getCallIntent(number,
(getActivity() instanceof DialtactsActivity ?
- ((DialtactsActivity)getActivity()).getCallOrigin() : null));
+ ((DialtactsActivity) getActivity()).getCallOrigin() : null));
startActivity(intent);
mClearDigitsOnStop = true;
getActivity().finish();
@@ -1622,7 +1622,7 @@ public class DialpadFragment extends Fragment
}
private Intent newFlashIntent() {
- final Intent intent = ContactsUtils.getCallIntent(EMPTY_NUMBER);
+ final Intent intent = CallUtil.getCallIntent(EMPTY_NUMBER);
intent.putExtra(EXTRA_SEND_EMPTY_FLASH, true);
return intent;
}