Merge "Dispatch screen state change events to Views Bug #6120957"

1 files changed, 30 insertions, 0 deletions

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 5ee7392..4c89218 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -4280,6 +4280,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
     }
 
     @Override
+    public void onScreenStateChanged(int screenState) {
+        super.onScreenStateChanged(screenState);
+        if (mEditor != null) getEditor().onScreenStateChanged(screenState);
+    }
+
+    @Override
     protected boolean isPaddingOffsetRequired() {
         return mShadowRadius != 0 || mDrawables != null;
     }
@@ -11400,6 +11406,30 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
             hideControllers();
         }
 
+        void onScreenStateChanged(int screenState) {
+            switch (screenState) {
+                case SCREEN_STATE_ON:
+                    resumeBlink();
+                    break;
+                case SCREEN_STATE_OFF:
+                    suspendBlink();
+                    break;
+            }
+        }
+
+        private void suspendBlink() {
+            if (mBlink != null) {
+                mBlink.cancel();
+            }
+        }
+
+        private void resumeBlink() {
+            if (mBlink != null) {
+                mBlink.uncancel();
+                makeBlink();
+            }
+        }
+
         void adjustInputType(boolean password, boolean passwordInputType,
                 boolean webPasswordInputType, boolean numberPasswordInputType) {
             // mInputType has been set from inputType, possibly modified by mInputMethod.