summaryrefslogtreecommitdiffstats
path: root/policy/src/com/android/internal
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-09-01 11:17:06 -0700
committerDianne Hackborn <hackbod@google.com>2011-09-01 12:39:17 -0700
commitba24e4d8bbeb60e96d74f05e21691dad61ce497e (patch)
treea9546623a2358532720b7448cd874dd62191258f /policy/src/com/android/internal
parent1434ab98e690cbcfcdcd2296b491a44bff14cc55 (diff)
downloadframeworks_base-ba24e4d8bbeb60e96d74f05e21691dad61ce497e.zip
frameworks_base-ba24e4d8bbeb60e96d74f05e21691dad61ce497e.tar.gz
frameworks_base-ba24e4d8bbeb60e96d74f05e21691dad61ce497e.tar.bz2
Fix issue #5229575: Youtube link shared through messaging is not...
...opening after selecting option "Youtube" as a luncher. Also: * Tweak window animations so that the wallpaper exist animations do not stop too early (causing the wallpaper to suddenly disappear). * Make sure no input is being processed while booting, to avoid accidentally doing things especially in the upgrade dialog. * Some other small cleanup. Change-Id: I40a6b53731991d4e31ac4502e3d85f0e47507481
Diffstat (limited to 'policy/src/com/android/internal')
-rwxr-xr-xpolicy/src/com/android/internal/policy/impl/PhoneWindowManager.java16
1 files changed, 15 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 8b450f6..2f5deba 100755
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -267,6 +267,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
int mLidOpen = LID_ABSENT;
boolean mSystemReady;
+ boolean mSystemBooted;
boolean mHdmiPlugged;
int mUiMode = Configuration.UI_MODE_TYPE_NORMAL;
int mDockMode = Intent.EXTRA_DOCK_STATE_UNDOCKED;
@@ -2497,6 +2498,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mKeyguardMediator.isShowingAndNotHidden() :
mKeyguardMediator.isShowing());
+ if (!mSystemBooted) {
+ // If we have not yet booted, don't let key events do anything.
+ return 0;
+ }
+
if (false) {
Log.d(TAG, "interceptKeyTq keycode=" + keyCode
+ " screenIsOn=" + isScreenOn + " keyguardActive=" + keyguardActive);
@@ -3100,6 +3106,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
}
+ /** {@inheritDoc} */
+ public void systemBooted() {
+ synchronized (mLock) {
+ mSystemBooted = true;
+ }
+ }
+
ProgressDialog mBootMsgDialog = null;
/** {@inheritDoc} */
@@ -3492,7 +3505,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
public void dump(String prefix, FileDescriptor fd, PrintWriter pw, String[] args) {
pw.print(prefix); pw.print("mSafeMode="); pw.print(mSafeMode);
- pw.print(" mSystemRead="); pw.println(mSystemReady);
+ pw.print(" mSystemReady="); pw.print(mSystemReady);
+ pw.print(" mSystemBooted="); pw.println(mSystemBooted);
pw.print(prefix); pw.print("mLidOpen="); pw.print(mLidOpen);
pw.print(" mLidOpenRotation="); pw.print(mLidOpenRotation);
pw.print(" mHdmiPlugged="); pw.println(mHdmiPlugged);