Merge "[do not auto-merge] Check that Activity is still active after AsyncTask." into gingerbread
diff --git a/res/drawable-hdpi-finger/dial_num_0_blk.png b/res/drawable-hdpi-finger/dial_num_0_blk.png
index 960d968..9470fd8 100644
--- a/res/drawable-hdpi-finger/dial_num_0_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_0_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_1_no_vm_blk.png b/res/drawable-hdpi-finger/dial_num_1_no_vm_blk.png
index d150354..34ab6a8 100644
--- a/res/drawable-hdpi-finger/dial_num_1_no_vm_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_1_no_vm_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_2_blk.png b/res/drawable-hdpi-finger/dial_num_2_blk.png
index 7b0cee7..a451476 100644
--- a/res/drawable-hdpi-finger/dial_num_2_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_2_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_3_blk.png b/res/drawable-hdpi-finger/dial_num_3_blk.png
index d2efe88..2654002 100644
--- a/res/drawable-hdpi-finger/dial_num_3_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_3_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_4_blk.png b/res/drawable-hdpi-finger/dial_num_4_blk.png
index fc3ed43..df5dd09 100644
--- a/res/drawable-hdpi-finger/dial_num_4_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_4_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_5_blk.png b/res/drawable-hdpi-finger/dial_num_5_blk.png
index 5c78c75..431f662 100644
--- a/res/drawable-hdpi-finger/dial_num_5_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_5_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_6_blk.png b/res/drawable-hdpi-finger/dial_num_6_blk.png
index 583fb2a..1592381 100644
--- a/res/drawable-hdpi-finger/dial_num_6_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_6_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_7_blk.png b/res/drawable-hdpi-finger/dial_num_7_blk.png
index 793660b..aedc9cb 100644
--- a/res/drawable-hdpi-finger/dial_num_7_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_7_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_8_blk.png b/res/drawable-hdpi-finger/dial_num_8_blk.png
index 0ee87fe..1320a9a 100644
--- a/res/drawable-hdpi-finger/dial_num_8_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_8_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_9_blk.png b/res/drawable-hdpi-finger/dial_num_9_blk.png
index 920235a..db9bd40 100644
--- a/res/drawable-hdpi-finger/dial_num_9_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_9_blk.png
Binary files differ
diff --git a/src/com/android/contacts/ui/ContactsPreferencesActivity.java b/src/com/android/contacts/ui/ContactsPreferencesActivity.java
index 96218e6..6bc9be8 100644
--- a/src/com/android/contacts/ui/ContactsPreferencesActivity.java
+++ b/src/com/android/contacts/ui/ContactsPreferencesActivity.java
@@ -245,7 +245,6 @@
};
return new AlertDialog.Builder(this)
- .setIcon(com.android.internal.R.drawable.ic_dialog_menu_generic)
.setTitle(R.string.display_options_sort_list_by)
.setSingleChoiceItems(items, -1, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
@@ -264,7 +263,6 @@
};
return new AlertDialog.Builder(this)
- .setIcon(com.android.internal.R.drawable.ic_dialog_menu_generic)
.setTitle(R.string.display_options_view_names_as)
.setSingleChoiceItems(items, -1, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
