summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Cosmin Băieș <cosminbaies@google.com> 2023-06-28 17:02:37 +0200
committer Cosmin Băieș <cosminbaies@google.com> 2023-07-03 13:06:03 +0200
commite1a4835bee60ade1b70077dfb341bdc35b7ac065 (patch)
tree5362f215e7493213bb6b067d9751ce6936d630cb
parent24008f68a4bacb7460d9d7d519f04399b8eb5111 (diff)
Deprecate InputMethod#SHOW_FORCED
As InputMethodManager#SHOW_FORCED was deprecated in T, we should keep both flags consistently deprecated. Test: n/a Bug: 289210045 Change-Id: I399484cb43bd60e3e8904358940273353a839b8a
-rw-r--r--core/api/current.txt2
-rw-r--r--core/java/android/view/inputmethod/InputMethod.java4
-rw-r--r--core/java/android/view/inputmethod/InputMethodManager.java2
3 files changed, 6 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index e9e084d9ad57..74be14fa9c34 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -55765,7 +55765,7 @@ package android.view.inputmethod {
field public static final String SERVICE_INTERFACE = "android.view.InputMethod";
field public static final String SERVICE_META_DATA = "android.view.im";
field public static final int SHOW_EXPLICIT = 1; // 0x1
- field public static final int SHOW_FORCED = 2; // 0x2
+ field @Deprecated public static final int SHOW_FORCED = 2; // 0x2
}
public static interface InputMethod.SessionCallback {
diff --git a/core/java/android/view/inputmethod/InputMethod.java b/core/java/android/view/inputmethod/InputMethod.java
index 92380ed7a7bc..6340388b5d5b 100644
--- a/core/java/android/view/inputmethod/InputMethod.java
+++ b/core/java/android/view/inputmethod/InputMethod.java
@@ -282,7 +282,11 @@ public interface InputMethod {
* Flag for {@link #showSoftInput}: this show has been forced to
* happen by the user. If set, the input method should remain visible
* until deliberated dismissed by the user in its UI.
+ *
+ * @deprecated {@link InputMethodManager#SHOW_FORCED} is deprecated and
+ * should no longer be used by apps. IMEs likewise should no longer react to this flag.
*/
+ @Deprecated
public static final int SHOW_FORCED = 0x00002;
/**
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index 3f308e6fccee..fb94d49276cb 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -2018,7 +2018,7 @@ public final class InputMethodManager {
*
* @deprecated Use {@link #showSoftInput} without this flag instead. Using this flag can lead
* to the soft input remaining visible even when the calling application is closed. The
- * use of this flag can make the soft input remains visible globally. Starting in
+ * use of this flag can make the soft input remain visible globally. Starting in
* {@link Build.VERSION_CODES#TIRAMISU Android T}, this flag only has an effect while the
* caller is currently focused.
*/