summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-06-09 10:08:50 +0800
committerAdnan <adnan@cyngn.com>2014-09-03 15:41:22 -0700
commit6072b60eff00c57726e8b7f3756f6fa9222f3e28 (patch)
tree6cbb12c8f38290099065567342661d95549c1b43
parentae41d32c48c99e858a50bf4f32dd25ff0d94ff7f (diff)
downloadandroid_packages_apps_UnifiedEmail-6072b60eff00c57726e8b7f3756f6fa9222f3e28.tar.gz
android_packages_apps_UnifiedEmail-6072b60eff00c57726e8b7f3756f6fa9222f3e28.tar.bz2
android_packages_apps_UnifiedEmail-6072b60eff00c57726e8b7f3756f6fa9222f3e28.zip
Email: Do not invalidate the option menu when the search view expanded.
It will invalidate the option menu when the mail update. So the searchview will request focus, lead the keypad flash. Don't invalidate the option menu when the search option was expanded. CRs-fixed: 675187 Change-Id: I834750410121e55b82395c8a16cae276ce161af3
-rw-r--r--src/com/android/mail/ui/MailActionBarView.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/mail/ui/MailActionBarView.java b/src/com/android/mail/ui/MailActionBarView.java
index 531af82ef..a09384f88 100644
--- a/src/com/android/mail/ui/MailActionBarView.java
+++ b/src/com/android/mail/ui/MailActionBarView.java
@@ -751,8 +751,9 @@ public class MailActionBarView extends LinearLayout implements ViewMode.ModeChan
if (changingFolders && !ConversationListContext.isSearchResult(listContext)) {
closeSearchField();
}
-
- mActivity.invalidateOptionsMenu();
+ if (mSearch == null || !mSearch.isActionViewExpanded()) {
+ mActivity.invalidateOptionsMenu();
+ }
}
@Override