Merge "Close clipboard text editor when text is copied" into tm-dev

1 files changed, 14 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/EditTextActivity.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/EditTextActivity.java
index 1621cbc0be72..f710d0154060 100644
--- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/EditTextActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/EditTextActivity.java
@@ -34,7 +34,8 @@ import com.android.systemui.R;
 /**
  * Lightweight activity for editing text clipboard contents
  */
-public class EditTextActivity extends Activity {
+public class EditTextActivity extends Activity
+        implements ClipboardManager.OnPrimaryClipChangedListener {
     private static final String TAG = "EditTextActivity";
 
     private EditText mEditText;
@@ -71,6 +72,18 @@ public class EditTextActivity extends Activity {
         }
         mEditText.setText(clip.getItemAt(0).getText());
         mEditText.requestFocus();
+        mClipboardManager.addPrimaryClipChangedListener(this);
+    }
+
+    @Override
+    protected void onPause() {
+        mClipboardManager.removePrimaryClipChangedListener(this);
+        super.onPause();
+    }
+
+    @Override // ClipboardManager.OnPrimaryClipChangedListener
+    public void onPrimaryClipChanged() {
+        hideImeAndFinish();
     }
 
     private void saveToClipboard() {