Don't force open keyboard when RTT is active.
Bug: 79094585
Test: manual
PiperOrigin-RevId: 195130360
Change-Id: I2763ddd950d0fe2479b442fe18363b8ec45a3178
diff --git a/java/com/android/dialer/common/UiUtil.java b/java/com/android/dialer/common/UiUtil.java
index 4c4ebea..20c93e1 100644
--- a/java/com/android/dialer/common/UiUtil.java
+++ b/java/com/android/dialer/common/UiUtil.java
@@ -32,7 +32,14 @@
}
/** Opens the android keyboard. */
- public static void openKeyboardFrom(Context context, View view) {
+ public static void showKeyboardFrom(Context context, View view) {
+ InputMethodManager inputMethodManager =
+ (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+ inputMethodManager.showSoftInput(view, 0);
+ }
+
+ /** Force open the android keyboard. */
+ public static void forceOpenKeyboardFrom(Context context, View view) {
InputMethodManager inputMethodManager =
(InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
inputMethodManager.toggleSoftInputFromWindow(
diff --git a/java/com/android/dialer/main/impl/toolbar/SearchBarView.java b/java/com/android/dialer/main/impl/toolbar/SearchBarView.java
index 8ea9429..60b0673 100644
--- a/java/com/android/dialer/main/impl/toolbar/SearchBarView.java
+++ b/java/com/android/dialer/main/impl/toolbar/SearchBarView.java
@@ -219,7 +219,7 @@
}
public void showKeyboard() {
- UiUtil.openKeyboardFrom(getContext(), searchBox);
+ UiUtil.forceOpenKeyboardFrom(getContext(), searchBox);
}
public void setHint(@StringRes int hint) {
diff --git a/java/com/android/incallui/rtt/impl/RttChatFragment.java b/java/com/android/incallui/rtt/impl/RttChatFragment.java
index 1c43f51..e567159 100644
--- a/java/com/android/incallui/rtt/impl/RttChatFragment.java
+++ b/java/com/android/incallui/rtt/impl/RttChatFragment.java
@@ -465,7 +465,7 @@
submitButton.setVisibility(View.VISIBLE);
editText.setFocusableInTouchMode(true);
if (editText.requestFocus()) {
- UiUtil.openKeyboardFrom(getContext(), editText);
+ UiUtil.showKeyboardFrom(getContext(), editText);
}
adapter.showAdvisory();
}