summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-08-06 18:18:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-06 18:18:57 +0000
commit04828df84eeac9c1a2025c5958c4e2256abda9c8 (patch)
treeb36b8fd66582be8bbf6d5bacc0021f1c66dd467a /core/java
parent7ae119ebff1389d97fb0fb85871922b56d97970f (diff)
parentdd228fbb4d2cb3d178ed7f1889343bfe177aafa2 (diff)
Merge "Make sure IME focus is synced to View focus" into nyc-mr1-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/View.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 0cdf5e115e3a..e7553ec943ec 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -9888,6 +9888,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
public void dispatchFinishTemporaryDetach() {
onFinishTemporaryDetach();
mPrivateFlags3 &= ~PFLAG3_TEMPORARY_DETACH;
+ if (hasWindowFocus() && hasFocus()) {
+ InputMethodManager.getInstance().focusIn(this);
+ }
}
/**