summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-09-18 14:53:27 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-18 14:53:27 -0700
commit2f7d7c9bdbda2956266492f98b5f95a428225a7d (patch)
tree2916343d3fe078c4a8bff6f2533673a2f6426eae /core
parent04e3bb6d32e73a5b7a74186e643458de467ac596 (diff)
parent38e29a61d0c87fe3e391d24e2eb11dd1800d107d (diff)
downloadframeworks_base-2f7d7c9bdbda2956266492f98b5f95a428225a7d.zip
frameworks_base-2f7d7c9bdbda2956266492f98b5f95a428225a7d.tar.gz
frameworks_base-2f7d7c9bdbda2956266492f98b5f95a428225a7d.tar.bz2
Merge "Fix issue #5242779: Device not responding to touch on unlock screen"
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/IWindowManager.aidl5
-rw-r--r--core/java/android/view/WindowManagerPolicy.java10
2 files changed, 11 insertions, 4 deletions
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl
index 0dc781f..335c66b 100644
--- a/core/java/android/view/IWindowManager.aidl
+++ b/core/java/android/view/IWindowManager.aidl
@@ -23,6 +23,7 @@ import android.content.res.CompatibilityInfo;
import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.Point;
+import android.os.IRemoteCallback;
import android.view.IApplicationToken;
import android.view.IOnKeyguardExitResult;
import android.view.IRotationWatcher;
@@ -220,7 +221,7 @@ interface IWindowManager
void setPointerSpeed(int speed);
/**
- * Block until all windows the window manager knows about have been drawn.
+ * Block until the given window has been drawn to the screen.
*/
- void waitForAllDrawn();
+ void waitForWindowDrawn(IBinder token, in IRemoteCallback callback);
}
diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java
index 980e454..fdbda4c 100644
--- a/core/java/android/view/WindowManagerPolicy.java
+++ b/core/java/android/view/WindowManagerPolicy.java
@@ -772,10 +772,16 @@ public interface WindowManagerPolicy {
*/
public void screenTurnedOff(int why);
+ public interface ScreenOnListener {
+ void onScreenOn();
+ };
+
/**
- * Called after the screen turns on.
+ * Called when the power manager would like to turn the screen on.
+ * Must call back on the listener to tell it when the higher-level system
+ * is ready for the screen to go on (i.e. the lock screen is shown).
*/
- public void screenTurnedOn();
+ public void screenTurningOn(ScreenOnListener screenOnListener);
/**
* Return whether the screen is currently on.