Merge changes I6a6d7518,I2740d94a into androidx-main

* changes:
  Use SoftwareKeyboardControllerCompat in Compose
  Add SoftwareKeyboardControllerCompat

Author: zach-klippenstein

compose/foundation/foundation/build.gradle

@@ -43,7 +43,7 @@ dependencies {
         implementation(libs.kotlinStdlibCommon)
         implementation(project(":compose:foundation:foundation-layout"))
         implementation(project(':emoji2:emoji2'))
-        implementation("androidx.core:core:1.9.0")
+        implementation(project(':core:core'))
         implementation("androidx.compose.ui:ui-graphics:1.2.1")
         implementation("androidx.compose.ui:ui-text:1.2.1")
         implementation("androidx.compose.ui:ui-util:1.2.1")
@@ -111,7 +111,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
             androidMain.dependencies {
                 api("androidx.annotation:annotation:1.1.0")
                 implementation(project(':emoji2:emoji2'))
-                implementation("androidx.core:core:1.9.0")
+                implementation(project(":core:core"))
             }
 
             desktopMain.dependencies {

compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/text2/input/internal/ComposeInputMethodManager.kt

@@ -16,22 +16,16 @@
 
 package androidx.compose.foundation.text2.input.internal
 
-import android.app.Activity
 import android.content.Context
-import android.content.ContextWrapper
 import android.os.Build
 import android.view.KeyEvent
 import android.view.View
-import android.view.Window
 import android.view.inputmethod.BaseInputConnection
 import android.view.inputmethod.ExtractedText
 import android.view.inputmethod.InputMethodManager
-import androidx.annotation.DoNotInline
 import androidx.annotation.RequiresApi
 import androidx.annotation.RestrictTo
-import androidx.compose.ui.window.DialogWindowProvider
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.SoftwareKeyboardControllerCompat
 import org.jetbrains.annotations.TestOnly
 
 /**
@@ -81,7 +75,6 @@ internal fun ComposeInputMethodManager(view: View): ComposeInputMethodManager =
 /** This lets us swap out the implementation in our own tests. */
 private var ComposeInputMethodManagerFactory: (View) -> ComposeInputMethodManager = { view ->
     when {
-        Build.VERSION.SDK_INT >= 30 -> ComposeInputMethodManagerImplApi30(view)
         Build.VERSION.SDK_INT >= 24 -> ComposeInputMethodManagerImplApi24(view)
         else -> ComposeInputMethodManagerImplApi21(view)
     }
@@ -109,18 +102,19 @@ private abstract class ComposeInputMethodManagerImpl(protected val view: View) :
 
     private var imm: InputMethodManager? = null
 
+    private val softwareKeyboardControllerCompat =
+        SoftwareKeyboardControllerCompat(view)
+
     override fun restartInput() {
         requireImm().restartInput(view)
     }
 
     override fun showSoftInput() {
-        view.post {
-            requireImm().showSoftInput(view, 0)
-        }
+        softwareKeyboardControllerCompat.show()
     }
 
     override fun hideSoftInput() {
-        requireImm().hideSoftInputFromWindow(view.windowToken, 0)
+        softwareKeyboardControllerCompat.hide()
     }
 
     override fun updateExtractedText(
@@ -175,43 +169,3 @@ private open class ComposeInputMethodManagerImplApi24(view: View) :
         requireImm().dispatchKeyEventFromInputMethod(view, event)
     }
 }
-
-@RequiresApi(30)
-private class ComposeInputMethodManagerImplApi30(view: View) :
-    ComposeInputMethodManagerImplApi24(view) {
-
-    /**
-     * Get a [WindowInsetsControllerCompat] for the view. This returns a new instance every time,
-     * since the view may return null or not null at different times depending on window attach
-     * state.
-     */
-    private val insetsControllerCompat
-        // This can return null when, for example, the view is not attached to a window.
-        get() = view.findWindow()?.let { WindowInsetsControllerCompat(it, view) }
-
-    @DoNotInline
-    override fun showSoftInput() {
-        insetsControllerCompat
-            ?.apply { show(WindowInsetsCompat.Type.ime()) }
-            ?: super.showSoftInput()
-    }
-
-    @DoNotInline
-    override fun hideSoftInput() {
-        insetsControllerCompat
-            ?.apply { hide(WindowInsetsCompat.Type.ime()) }
-            ?: super.showSoftInput()
-    }
-
-    // TODO(b/221889664) Replace with composition local when available.
-    private fun View.findWindow(): Window? =
-        (parent as? DialogWindowProvider)?.window
-            ?: context.findWindow()
-
-    private tailrec fun Context.findWindow(): Window? =
-        when (this) {
-            is Activity -> window
-            is ContextWrapper -> baseContext.findWindow()
-            else -> null
-        }
-}

compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/text/input/InputMethodManager.kt

@@ -16,19 +16,11 @@
 
 package androidx.compose.ui.text.input
 
-import android.app.Activity
 import android.content.Context
-import android.content.ContextWrapper
-import android.os.Build
 import android.util.Log
 import android.view.View
-import android.view.Window
 import android.view.inputmethod.ExtractedText
-import androidx.annotation.DoNotInline
-import androidx.annotation.RequiresApi
-import androidx.compose.ui.window.DialogWindowProvider
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.SoftwareKeyboardControllerCompat
 
 internal interface InputMethodManager {
     fun restartInput()
@@ -61,11 +53,8 @@ internal class InputMethodManagerImpl(private val view: View) : InputMethodManag
             as android.view.inputmethod.InputMethodManager
     }
 
-    private val helper = if (Build.VERSION.SDK_INT < 30) {
-        ImmHelper21(view)
-    } else {
-        ImmHelper30(view)
-    }
+    private val softwareKeyboardControllerCompat =
+        SoftwareKeyboardControllerCompat(view)
 
     override fun restartInput() {
         imm.restartInput(view)
@@ -76,11 +65,11 @@ internal class InputMethodManagerImpl(private val view: View) : InputMethodManag
             Log.d(TAG, "InputMethodManagerImpl: requesting soft input on non focused field")
         }
 
-        helper.showSoftInput(imm)
+        softwareKeyboardControllerCompat.show()
     }
 
     override fun hideSoftInput() {
-        helper.hideSoftInput(imm)
+        softwareKeyboardControllerCompat.hide()
     }
 
     override fun updateExtractedText(
@@ -99,90 +88,3 @@ internal class InputMethodManagerImpl(private val view: View) : InputMethodManag
         imm.updateSelection(view, selectionStart, selectionEnd, compositionStart, compositionEnd)
     }
 }
-
-private interface ImmHelper {
-    fun showSoftInput(imm: android.view.inputmethod.InputMethodManager)
-    fun hideSoftInput(imm: android.view.inputmethod.InputMethodManager)
-}
-
-private class ImmHelper21(private val view: View) : ImmHelper {
-
-    @DoNotInline
-    override fun showSoftInput(imm: android.view.inputmethod.InputMethodManager) {
-        view.post {
-            imm.showSoftInput(view, 0)
-        }
-    }
-
-    @DoNotInline
-    override fun hideSoftInput(imm: android.view.inputmethod.InputMethodManager) {
-        imm.hideSoftInputFromWindow(view.windowToken, 0)
-    }
-}
-
-@RequiresApi(30)
-private class ImmHelper30(private val view: View) : ImmHelper {
-
-    /**
-     * Get a [WindowInsetsControllerCompat] for the view. This returns a new instance every time,
-     * since the view may return null or not null at different times depending on window attach
-     * state.
-     */
-    private val insetsControllerCompat
-        // This can return null when, for example, the view is not attached to a window.
-        get() = view.findWindow()?.let { WindowInsetsControllerCompat(it, view) }
-
-    /**
-     * This class falls back to the legacy implementation when the window insets controller isn't
-     * available.
-     */
-    private val immHelper21: ImmHelper21
-        get() = _immHelper21 ?: ImmHelper21(view).also { _immHelper21 = it }
-    private var _immHelper21: ImmHelper21? = null
-
-    @DoNotInline
-    override fun showSoftInput(imm: android.view.inputmethod.InputMethodManager) {
-        insetsControllerCompat?.apply {
-            show(WindowInsetsCompat.Type.ime())
-        } ?: immHelper21.showSoftInput(imm)
-    }
-
-    @DoNotInline
-    override fun hideSoftInput(imm: android.view.inputmethod.InputMethodManager) {
-        insetsControllerCompat?.apply {
-            hide(WindowInsetsCompat.Type.ime())
-        } ?: immHelper21.hideSoftInput(imm)
-    }
-
-    // TODO(b/221889664) Replace with composition local when available.
-    private fun View.findWindow(): Window? {
-        var view: View = this
-        while (true) {
-            if (view is DialogWindowProvider) {
-                return view.window
-            }
-            val parent = view.parent as? View
-            if (parent == null) {
-                // Found the decor view of the current window. We can't get the window directly from
-                // the view, but we can get the window of the view's context. However, there's no
-                // guarantee that the view and its context share a window. For example, in a dialog,
-                // the view's context is the activity hosting the dialog, so the context's view tree
-                // will be entirely separate from the dialog's view tree. We only return the
-                // context's window if we are actually in that window, i.e. have the same root view.
-                // Otherwise we return null to fallback to not using window insets.
-                val windowFromContext = view.context.findWindow() ?: return null
-                val windowDecorView = windowFromContext.decorView
-                return if (windowDecorView === view) windowFromContext else null
-            }
-            view = parent
-        }
-    }
-
-    private tailrec fun Context.findWindow(): Window? {
-        return when (this) {
-            is Activity -> window
-            is ContextWrapper -> baseContext.findWindow()
-            else -> null
-        }
-    }
-}

core/core/api/current.txt

@@ -2716,6 +2716,12 @@ package androidx.core.view {
     method public int computeVerticalScrollRange();
   }
 
+  public final class SoftwareKeyboardControllerCompat {
+    ctor public SoftwareKeyboardControllerCompat(android.view.View);
+    method public void hide();
+    method public void show();
+  }
+
   public interface TintableBackgroundView {
     method public android.content.res.ColorStateList? getSupportBackgroundTintList();
     method public android.graphics.PorterDuff.Mode? getSupportBackgroundTintMode();

core/core/api/public_plus_experimental_current.txt

@@ -2723,6 +2723,12 @@ package androidx.core.view {
     method public int computeVerticalScrollRange();
   }
 
+  public final class SoftwareKeyboardControllerCompat {
+    ctor public SoftwareKeyboardControllerCompat(android.view.View);
+    method public void hide();
+    method public void show();
+  }
+
   public interface TintableBackgroundView {
     method public android.content.res.ColorStateList? getSupportBackgroundTintList();
     method public android.graphics.PorterDuff.Mode? getSupportBackgroundTintMode();

core/core/api/restricted_current.txt

@@ -3161,6 +3161,12 @@ package androidx.core.view {
     method public int computeVerticalScrollRange();
   }
 
+  public final class SoftwareKeyboardControllerCompat {
+    ctor public SoftwareKeyboardControllerCompat(android.view.View);
+    method public void hide();
+    method public void show();
+  }
+
   public interface TintableBackgroundView {
     method public android.content.res.ColorStateList? getSupportBackgroundTintList();
     method public android.graphics.PorterDuff.Mode? getSupportBackgroundTintMode();

core/core/src/androidTest/AndroidManifest.xml

@@ -122,6 +122,12 @@
             android:exported="true"
             android:theme="@android:style/Theme.Light.NoTitleBar" />
 
+        <activity
+            android:name="androidx.core.view.SoftwareKeyboardControllerCompatActivity"
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@android:style/Theme.Light.NoTitleBar" />
+
         <activity
             android:name="androidx.core.app.GetSystemLocalesActivity"
             android:exported="true" />

core/core/src/androidTest/java/androidx/core/view/SoftwareKeyboardControllerCompatActivity.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.core.view;
+
+import android.support.v4.BaseTestActivity;
+
+import androidx.core.test.R;
+
+public class SoftwareKeyboardControllerCompatActivity extends BaseTestActivity {
+    @Override
+    protected int getContentViewLayoutResId() {
+        return R.layout.insets_compat_activity;
+    }
+}