Merge "Add Call Settings menu in dialpad fragment."

commit: fa3f7b6898e9f61b93a4c871c307bd72cb719806 [log] [tgz]
author: Daisuke Miyakawa <dmiyakawa@google.com> Tue Jun 28 17:54:34 2011 -0700
committer: Android (Google) Code Review <android-gerrit@google.com> Tue Jun 28 17:54:34 2011 -0700
tree: a874cf2021a5efb06684f2572d7c50d89da2b118
parent: 31a42d7143d7952c78429b1664e37fb43788ac93 [diff]
parent: 5f0b0843665e3edc76735965a8e1fa340fff7802 [diff]
diff --git a/res/drawable-hdpi/dial_num_0_wht.png b/res/drawable-hdpi/dial_num_0_wht.png
index f2dcf02..2b194c8 100644
--- a/res/drawable-hdpi/dial_num_0_wht.png
+++ b/res/drawable-hdpi/dial_num_0_wht.png
Binary files differ

diff --git a/res/drawable-hdpi/dial_num_1_no_vm_wht.png b/res/drawable-hdpi/dial_num_1_no_vm_wht.png
index 8415b05..beaca97 100644
--- a/res/drawable-hdpi/dial_num_1_no_vm_wht.png
+++ b/res/drawable-hdpi/dial_num_1_no_vm_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
index 852de4e..944d5d8 100644
--- a/res/drawable-hdpi/dial_num_2_wht.png
+++ 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
index 69fd333..9ed2bb5 100644
--- a/res/drawable-hdpi/dial_num_3_wht.png
+++ 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
index aab94de..92b1ca6 100644
--- a/res/drawable-hdpi/dial_num_4_wht.png
+++ 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
index de35f1f..21f1ce6 100644
--- a/res/drawable-hdpi/dial_num_5_wht.png
+++ 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
index 407ff2e..b794ffb 100644
--- a/res/drawable-hdpi/dial_num_6_wht.png
+++ 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
index 7a5a38c..c3cc401 100644
--- a/res/drawable-hdpi/dial_num_7_wht.png
+++ 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
index a29b24d..c199f96 100644
--- a/res/drawable-hdpi/dial_num_8_wht.png
+++ 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
index a402147..07251e5 100644
--- a/res/drawable-hdpi/dial_num_9_wht.png
+++ 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
index 0de2ab4..0e178dc 100644
--- a/res/drawable-hdpi/dial_num_pound_wht.png
+++ 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
index b25eb9b..4271556 100644
--- a/res/drawable-hdpi/dial_num_star_wht.png
+++ b/res/drawable-hdpi/dial_num_star_wht.png
Binary files differ

diff --git a/res/drawable-mdpi/dial_num_0_wht.png b/res/drawable-mdpi/dial_num_0_wht.png
index c3b3f2c..81a2e46 100644
--- a/res/drawable-mdpi/dial_num_0_wht.png
+++ b/res/drawable-mdpi/dial_num_0_wht.png
Binary files differ

diff --git a/res/drawable-mdpi/dial_num_1_no_vm_wht.png b/res/drawable-mdpi/dial_num_1_no_vm_wht.png
index a5bdb41..8871de5 100644
--- a/res/drawable-mdpi/dial_num_1_no_vm_wht.png
+++ b/res/drawable-mdpi/dial_num_1_no_vm_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
index ac99cec..129224f 100644
--- a/res/drawable-mdpi/dial_num_2_wht.png
+++ 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
index 69170b9..7828567 100644
--- a/res/drawable-mdpi/dial_num_3_wht.png
+++ 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
index 48a02a5..730a4d8 100644
--- a/res/drawable-mdpi/dial_num_4_wht.png
+++ 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
index e3c9940..8d5a6b3 100644
--- a/res/drawable-mdpi/dial_num_5_wht.png
+++ 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
index ab12781..d2bc13d 100644
--- a/res/drawable-mdpi/dial_num_6_wht.png
+++ 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
index 9e66205..41c29ae 100644
--- a/res/drawable-mdpi/dial_num_7_wht.png
+++ 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
index 2af30fa..b070426 100644
--- a/res/drawable-mdpi/dial_num_8_wht.png
+++ 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
index 1c99b61..9392aae 100644
--- a/res/drawable-mdpi/dial_num_9_wht.png
+++ 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
index e17f2bf..c9a1535 100644
--- a/res/drawable-mdpi/dial_num_pound_wht.png
+++ 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
index 86113ed..4030646 100644
--- a/res/drawable-mdpi/dial_num_star_wht.png
+++ b/res/drawable-mdpi/dial_num_star_wht.png
Binary files differ

diff --git a/res/drawable-xhdpi/dial_num_0_blk.png b/res/drawable-xhdpi/dial_num_0_blk.png
new file mode 100644
index 0000000..db3d157
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_0_blk.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 0000000..c5f032f
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_0_wht.png
Binary files differ

diff --git a/res/drawable-xhdpi/dial_num_1_no_vm_blk.png b/res/drawable-xhdpi/dial_num_1_no_vm_blk.png
new file mode 100644
index 0000000..452eed0
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_1_no_vm_blk.png
Binary files differ

diff --git a/res/drawable-xhdpi/dial_num_1_no_vm_wht.png b/res/drawable-xhdpi/dial_num_1_no_vm_wht.png
new file mode 100644
index 0000000..37d90be
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_1_no_vm_wht.png
Binary files differ

diff --git a/res/drawable-xhdpi/dial_num_2_blk.png b/res/drawable-xhdpi/dial_num_2_blk.png
new file mode 100644
index 0000000..2893683
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_2_blk.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 0000000..3512386
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_2_wht.png
Binary files differ

diff --git a/res/drawable-xhdpi/dial_num_3_blk.png b/res/drawable-xhdpi/dial_num_3_blk.png
new file mode 100644
index 0000000..7ba26fa
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_3_blk.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 0000000..c2be01e
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_3_wht.png
Binary files differ

diff --git a/res/drawable-xhdpi/dial_num_4_blk.png b/res/drawable-xhdpi/dial_num_4_blk.png
new file mode 100644
index 0000000..bff80f8
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_4_blk.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 0000000..eb9f4e2
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_4_wht.png
Binary files differ

diff --git a/res/drawable-xhdpi/dial_num_5_blk.png b/res/drawable-xhdpi/dial_num_5_blk.png
new file mode 100644
index 0000000..b2a9e75
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_5_blk.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 0000000..8da8c82
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_5_wht.png
Binary files differ

diff --git a/res/drawable-xhdpi/dial_num_6_blk.png b/res/drawable-xhdpi/dial_num_6_blk.png
new file mode 100644
index 0000000..34e88ed
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_6_blk.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 0000000..c7a89fb
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_6_wht.png
Binary files differ

diff --git a/res/drawable-xhdpi/dial_num_7_blk.png b/res/drawable-xhdpi/dial_num_7_blk.png
new file mode 100644
index 0000000..c7abc7e
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_7_blk.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 0000000..e532501
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_7_wht.png
Binary files differ

diff --git a/res/drawable-xhdpi/dial_num_8_blk.png b/res/drawable-xhdpi/dial_num_8_blk.png
new file mode 100644
index 0000000..156e276
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_8_blk.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 0000000..bc3873b
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_8_wht.png
Binary files differ

diff --git a/res/drawable-xhdpi/dial_num_9_blk.png b/res/drawable-xhdpi/dial_num_9_blk.png
new file mode 100644
index 0000000..4d77bd0
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_9_blk.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 0000000..38c305f
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_9_wht.png
Binary files differ

diff --git a/res/drawable-xhdpi/dial_num_pound_blk.png b/res/drawable-xhdpi/dial_num_pound_blk.png
new file mode 100644
index 0000000..9946f61
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_pound_blk.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 0000000..114ea7b
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_pound_wht.png
Binary files differ

diff --git a/res/drawable-xhdpi/dial_num_star_blk.png b/res/drawable-xhdpi/dial_num_star_blk.png
new file mode 100644
index 0000000..2d9baab
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_star_blk.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 0000000..64c1153
--- /dev/null
+++ b/res/drawable-xhdpi/dial_num_star_wht.png
Binary files differ

diff --git a/src/com/android/contacts/list/ContactEntryListAdapter.java b/src/com/android/contacts/list/ContactEntryListAdapter.java
index 95a8c2b..62b678c 100644
--- a/src/com/android/contacts/list/ContactEntryListAdapter.java
+++ b/src/com/android/contacts/list/ContactEntryListAdapter.java

@@ -31,6 +31,7 @@
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Directory;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -320,9 +321,16 @@
 
     /**
      * Updates partitions according to the directory meta-data contained in the supplied
-     * cursor.  Takes ownership of the cursor and will close it.
+     * cursor.
      */
     public void changeDirectories(Cursor cursor) {
+        if (cursor.getCount() == 0) {
+            // Directory table must have at least local directory, without which this adapter will
+            // enter very weird state.
+            Log.e(TAG, "Directory search loader returned an empty cursor, which implies we have " +
+                    "no directory entries.", new RuntimeException());
+            return;
+        }
         HashSet<Long> directoryIds = new HashSet<Long>();
 
         int idColumnIndex = cursor.getColumnIndex(Directory._ID);
commit	fa3f7b6898e9f61b93a4c871c307bd72cb719806	[log] [tgz]
author	Daisuke Miyakawa <dmiyakawa@google.com>	Tue Jun 28 17:54:34 2011 -0700
committer	Android (Google) Code Review <android-gerrit@google.com>	Tue Jun 28 17:54:34 2011 -0700
tree	a874cf2021a5efb06684f2572d7c50d89da2b118
parent	31a42d7143d7952c78429b1664e37fb43788ac93 [diff]
parent	5f0b0843665e3edc76735965a8e1fa340fff7802 [diff]