summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Launcher.java
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2016-09-09 22:13:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-09 22:13:33 +0000
commit915d56abc7de0c2e13f4507cd2ef4fde44cfc94e (patch)
tree7dec7e7f4a00591d3c0a45511ebe05d7873c2ce4 /src/com/android/launcher3/Launcher.java
parent40851b637ea8e460953c7f2ea448357a86456cb4 (diff)
parentc2fe1147f9802d581d1e0c1da4dcaaf8ebdfa939 (diff)
downloadandroid_packages_apps_Trebuchet-915d56abc7de0c2e13f4507cd2ef4fde44cfc94e.tar.gz
android_packages_apps_Trebuchet-915d56abc7de0c2e13f4507cd2ef4fde44cfc94e.tar.bz2
android_packages_apps_Trebuchet-915d56abc7de0c2e13f4507cd2ef4fde44cfc94e.zip
Merge "Show IME when search query != null after rotation" into ub-launcher3-calgary-polish
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r--src/com/android/launcher3/Launcher.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 901900e0f..b628acf9e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -951,7 +951,7 @@ public class Launcher extends Activity
// view after launching an app, as they may be depending on the UI to be static to
// switch to another app, otherwise, if it was
showAppsView(false /* animated */, !launchedFromApp /* updatePredictedApps */,
- false /* focusSearchBar */);
+ mAppsView.shouldRestoreImeState() /* focusSearchBar */);
} else if (mOnResumeState == State.WIDGETS) {
showWidgetsView(false, false);
}