Merge "Make sure IME focus is synced to View focus" into nyc-mr1-dev

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);
+        }
     }
 
     /**