summaryrefslogtreecommitdiff
path: root/java/com/android
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2018-05-02 12:09:10 -0700
committerWeijia Xu <weijiaxu@google.com>2018-05-04 06:15:30 +0000
commitf16da49791f0af08ec0260d4e5b7c2ec6d6947c8 (patch)
tree2816462e5f2d4c4b3445430b7e2014725c046972 /java/com/android
parent6e1516d52539f2d41e57443249ca543d2481cce3 (diff)
Don't force open keyboard when RTT is active.
Bug: 79094585 Test: manual PiperOrigin-RevId: 195130360 Change-Id: I2763ddd950d0fe2479b442fe18363b8ec45a3178
Diffstat (limited to 'java/com/android')
-rw-r--r--java/com/android/dialer/common/UiUtil.java9
-rw-r--r--java/com/android/dialer/main/impl/toolbar/SearchBarView.java2
-rw-r--r--java/com/android/incallui/rtt/impl/RttChatFragment.java2
3 files changed, 10 insertions, 3 deletions
diff --git a/java/com/android/dialer/common/UiUtil.java b/java/com/android/dialer/common/UiUtil.java
index 4c4ebea11..20c93e190 100644
--- a/java/com/android/dialer/common/UiUtil.java
+++ b/java/com/android/dialer/common/UiUtil.java
@@ -32,7 +32,14 @@ public class UiUtil {
}
/** 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 8ea94299e..60b067379 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 @@ final class SearchBarView extends FrameLayout {
}
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 1c43f512d..e56715981 100644
--- a/java/com/android/incallui/rtt/impl/RttChatFragment.java
+++ b/java/com/android/incallui/rtt/impl/RttChatFragment.java
@@ -465,7 +465,7 @@ public class RttChatFragment extends Fragment
submitButton.setVisibility(View.VISIBLE);
editText.setFocusableInTouchMode(true);
if (editText.requestFocus()) {
- UiUtil.openKeyboardFrom(getContext(), editText);
+ UiUtil.showKeyboardFrom(getContext(), editText);
}
adapter.showAdvisory();
}