commit e7089abcbcd09deb9b67429c461ac6fc919bb2ff
author Yorke Lee <yorkelee@google.com> Sat Jan 19 00:11:29 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 19 00:11:29 2013 +0000
tree 1674a5a40c99d9826c662416a25d2c0cdf3b03a9
parent 8d5eec3c552c2ac23bc4d3324063627d31582615
parent bd43855af066f68a3911627a16e450bd126a0461

Merge "Fix navigation and focus issues in RawContactEditorView"

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

diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index d50c240..c22f058 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -416,7 +416,11 @@
             // expanding the {@link SearchView} when a search is initiated. Note that a side effect
             // of this method is that the {@link SearchView} query text is set to empty string.
             if (isIconifiedChanging) {
+                final CharSequence queryText = mSearchView.getQuery();
                 mSearchView.onActionViewExpanded();
+                if (!TextUtils.isEmpty(queryText)) {
+                    mSearchView.setQuery(queryText, false);
+                }
             }
             if (mActionBar.getNavigationMode() != ActionBar.NAVIGATION_MODE_STANDARD) {
                 mActionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);