diff options
| author | Tarandeep Singh <tarandeep@google.com> | 2017-06-13 00:12:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-13 00:12:08 +0000 |
| commit | b8b6f00b759e467f083831470870ad0848fdcbe5 (patch) | |
| tree | db77caf926cfdbc22580d2c7926c0ee5af1d3571 | |
| parent | 24acdf8a11a8bc7d17ddbf5204bf1725d8f5333d (diff) | |
| parent | 96d68d45f0be6c9589ca4509d3d6dd3b50bfa8f1 (diff) | |
Merge "SearchView focus should be preserved in split-screen."
| -rw-r--r-- | core/java/com/android/internal/app/LocalePickerWithRegion.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/app/LocalePickerWithRegion.java b/core/java/com/android/internal/app/LocalePickerWithRegion.java index d0719eeca04e..3d5cd0f5847b 100644 --- a/core/java/com/android/internal/app/LocalePickerWithRegion.java +++ b/core/java/com/android/internal/app/LocalePickerWithRegion.java @@ -238,7 +238,7 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O mSearchView.setOnQueryTextListener(this); // Restore previous search status - if (!TextUtils.isEmpty(mPreviousSearch)) { + if (mPreviousSearch != null) { searchMenuItem.expandActionView(); mSearchView.setIconified(false); mSearchView.setActivated(true); |