diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-24 15:05:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-24 15:05:35 +0000 |
| commit | 3be294a272164cf1920219d3e09cbabfefeb1de6 (patch) | |
| tree | 835b960d4ffd9f221581b2de83810d8534e62c58 | |
| parent | 3736d67a292f282220cadaf57500a052fd47ab4f (diff) | |
| parent | ff622c5257c612530aeca3f2fdae35947083e29b (diff) | |
| download | support-androidx-core-release.tar.gz | |
Merge "Merge cherrypicks of ['android-review.googlesource.com/3047368', 'android-review.googlesource.com/3055602'] into androidx-core-release." into androidx-core-releaseandroidx-core-release
| -rw-r--r-- | core/core/src/main/java/androidx/core/view/SoftwareKeyboardControllerCompat.java | 6 | ||||
| -rw-r--r-- | libraryversions.toml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/core/src/main/java/androidx/core/view/SoftwareKeyboardControllerCompat.java b/core/core/src/main/java/androidx/core/view/SoftwareKeyboardControllerCompat.java index dee46e13d79..a4900310aa3 100644 --- a/core/core/src/main/java/androidx/core/view/SoftwareKeyboardControllerCompat.java +++ b/core/core/src/main/java/androidx/core/view/SoftwareKeyboardControllerCompat.java @@ -192,10 +192,10 @@ public final class SoftwareKeyboardControllerCompat { } if (insetsController != null) { insetsController.show(WindowInsets.Type.ime()); - } else { - // Couldn't find an insets controller, fallback to old implementation - super.show(); } + // InputMethodManager.showSoftInput() will also send the current toolType info to IME. + // We always call it so that it can report update toolType correctly. + super.show(); } @Override diff --git a/libraryversions.toml b/libraryversions.toml index 623afb00d22..0f1cee4b210 100644 --- a/libraryversions.toml +++ b/libraryversions.toml @@ -34,7 +34,7 @@ CONSTRAINTLAYOUT_COMPOSE = "1.1.0-alpha13" CONSTRAINTLAYOUT_CORE = "1.1.0-alpha13" CONTENTPAGER = "1.1.0-alpha01" COORDINATORLAYOUT = "1.3.0-alpha02" -CORE = "1.13.0" +CORE = "1.13.1" CORE_ANIMATION = "1.0.0-rc01" CORE_ANIMATION_TESTING = "1.0.0-rc01" CORE_APPDIGEST = "1.0.0-alpha01" |