commit | d83a5c0019afaf662657ca74bab839a480f57720 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Feb 08 01:39:33 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 08 01:39:33 2021 +0000 |
tree | 3a97ba04176dee790558ad9d35d448f7e7b73c73 | |
parent | a47a1c45096595b9ac7478af428c74f84a0a5588 [diff] | |
parent | bcf2ecc9e5b19351ab8bdc9b128d019c16a7d477 [diff] |
Merge "After AA+Search Edu, bring up IME" into sc-dev am: bcf2ecc9e5 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13491648 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifd1c4687cdc2529fb8e38d05f0739d792decab13
diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java b/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java index 71270cc..016ec1b 100644 --- a/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java +++ b/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java
@@ -81,6 +81,7 @@ @Override protected void handleClose(boolean animate) { handleClose(animate, ANIMATION_DURATION); + mLauncher.getAllAppsController().getInsetController().show(); mLauncher.getStateManager().removeStateListener(this); }
diff --git a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java index f6e54aa..b34c8b8 100644 --- a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
@@ -86,6 +86,10 @@ mApps = appsView; } + public void show() { + mApps.getWindowInsetsController().show(WindowInsets.Type.ime()); + } + public void hide() { if (!Utilities.ATLEAST_R) return;