commit 350e8d53a135e0bb62308a93dd09777364c08a58
author Daisuke Miyakawa <dmiyakawa@google.com> Thu Jun 23 19:02:41 2011 -0700
committer Daisuke Miyakawa <dmiyakawa@google.com> Thu Jun 23 19:05:07 2011 -0700
tree 8e1e1df7eede9d8780fe177f8df6295521a10e7b
parent 68f33150cf394279fc97f06ba5601482741147b7

Handle menu event correctly.

Right now after showing search UI, every menu cannot be available.

- make them available
- refrain menu in search UI

Change-Id: I4bf0056c9b404d43c2ab2ac0f227441c1147d09f

src/com/android/contacts/activities/DialtactsActivity.java

diff --git a/src/com/android/contacts/activities/DialtactsActivity.java b/src/com/android/contacts/activities/DialtactsActivity.java
index 4494b3e..ab54960 100644
--- a/src/com/android/contacts/activities/DialtactsActivity.java
+++ b/src/com/android/contacts/activities/DialtactsActivity.java
@@ -698,6 +698,9 @@
         actionBar.setDisplayShowCustomEnabled(false);
         actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
 
+        // Request to update option menu.
+        invalidateOptionsMenu();
+
         mInSearchUi = false;
     }
 }

src/com/android/contacts/list/PhoneNumberPickerFragment.java

diff --git a/src/com/android/contacts/list/PhoneNumberPickerFragment.java b/src/com/android/contacts/list/PhoneNumberPickerFragment.java
index 071a370..a38f734 100644
--- a/src/com/android/contacts/list/PhoneNumberPickerFragment.java
+++ b/src/com/android/contacts/list/PhoneNumberPickerFragment.java
@@ -39,6 +39,9 @@
         setVisibleScrollbarEnabled(true);
         setSectionHeaderDisplayEnabled(true);
         setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_DATA_SHORTCUT);
+
+        // Show nothing instead of letting caller Activity show something.
+        setHasOptionsMenu(true);
     }
 
     public void setOnPhoneNumberPickerActionListener(OnPhoneNumberPickerActionListener listener) {