Merge commit '6d6c321f9dfcdbecac610d990ee9fa0f102dccdb'
* commit '6d6c321f9dfcdbecac610d990ee9fa0f102dccdb':
Cherry-pick from mr2 to eclair: DO NOT MERGE
Merge commit '3d8bc316ae81b443522c812a896d42fb2978ba3d'
* commit '3d8bc316ae81b443522c812a896d42fb2978ba3d':
Ignore requests to hide the keyguard if we are in the process of waking up.
Merge commit '89e6b425bcbecd8cb78b95c0c9a6bd4f34d25590'
* commit '89e6b425bcbecd8cb78b95c0c9a6bd4f34d25590':
Fix issue #2171460: Turn off background blurring of power dialog
Fix issue #2171766: Device can go to sleep while in dock
Merge commit '149c0543a3d5f450686b7c3d142ac5f8fcf61ed4'
* commit '149c0543a3d5f450686b7c3d142ac5f8fcf61ed4':
Partial fix for 2069703: Fix race condition in KeyguardViewManager.hide() that could result in a blank screen.
Merge commit 'c42268d25497d8093403bbe9f3ea63dad21b68e2'
* commit 'c42268d25497d8093403bbe9f3ea63dad21b68e2':
Hold a partial wakelock while showing the keyguard
Merge commit '515c82cdde6334778d8a75a7ad0bbb97271bed88'
* commit '515c82cdde6334778d8a75a7ad0bbb97271bed88':
Add some logging to help diagnose b/2164183
Merge commit 'a95e1cd1f846a949663e33e5a93f689702415b5a'
* commit 'a95e1cd1f846a949663e33e5a93f689702415b5a':
Work on issue #2163789: Way too much logging
Merge commit '84ec90cbdf950bfa129c30d504f117178c3e3ade'
* commit '84ec90cbdf950bfa129c30d504f117178c3e3ade':
Fix for 2129239: Always enable the menu hard key in LockScreen when 'ro.monkey' is set.
Merge commit 'dafe18ee8c8d7923580b0d6d03d44ffdb00372e6'
* commit 'dafe18ee8c8d7923580b0d6d03d44ffdb00372e6':
Make sure we wake up the screen if the keyguard is not visible when we think it should be.
Merge commit 'eb44da5077ae21571f39bae86d6be49b74c68e24' into eclair-mr2
* commit 'eb44da5077ae21571f39bae86d6be49b74c68e24':
Cherry-pick from mr2 to eclair: DO NOT MERGE
commit 149c0543a3d5f450686b7c3d142ac5f8fcf61ed4
BUG=2176949
Partial fix for 2069703: Fix race condition in KeyguardViewManager.hide() that could result in a blank screen.
This fixes a race condition seen whenever show() is called before the timer in hide() triggers. This can happen
for example if the user hits "Emergency Dial" followed by the back button before the 0.5s timeout completes. The result
is a blank screen with no keyguard view and no means to recover on devices w/o a keyboard.
The bug caused us to sometimes remove the newly created KeyguardView instead of the old one, leaving the view empty.
The fix is to always remove the last view.
Merge commit 'f184c68119489aa00eccba41d3babedce282518b' into eclair-mr2
* commit 'f184c68119489aa00eccba41d3babedce282518b':
Ignore requests to hide the keyguard if we are in the process of waking up.
This should fix a race condition that results in the screen waking up
and displaying nothing but wall paper
Bug b/2168660
Change-Id: I55bac0aaab8425cde282e7fc7e7c6b82217fbc9d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '2ae4f37c435ae02cf9038216e1dfce0b82d9caab' into eclair-mr2
* commit '2ae4f37c435ae02cf9038216e1dfce0b82d9caab':
More fix#2163209: alarm clock rings but is hidden behind lock screen
Another way we could miss the application's flags is because the
system now force hides application windows behind the lock screen. So
we need to use this new API to actually take those into account when
looking for the top-most window that can specify for the lock screen
to be removed or hidden.
I have tested with pulling the device in and out of the desktop with
all kinds of random speeds and ways and this -seems- to now cover
everything. Keeping fingers crossed.
Change-Id: Ice640eea6ee06ee27f069d60856fb394c7eeae51
Merge commit '08b8108e5873a758bb694aa0a64d758153145a76' into eclair-mr2
* commit '08b8108e5873a758bb694aa0a64d758153145a76':
Fix issue #2171460: Turn off background blurring of power dialog
Merge commit 'b4ccee6f4c4bff3e063a06b26a3314121d06467d' into eclair-mr2
* commit 'b4ccee6f4c4bff3e063a06b26a3314121d06467d':
Fix issue #2171766: Device can go to sleep while in dock
The issue I saw was then when plugging into the dock, we the battery
first is in the "USB" state before going to "AC". The phone window
manager would pick up the first state, but not the second.
This change reworks this code to always monitor the battery status
while plugged in to the dock, to update itself whenever that state
changes. When not in the dock, we don't monitor, since this is
only used to determine whether to keep the device on while in the
dock.
Change-Id: Ic1e8b584082a44c4e5df13ee19dab450775027f6
This fixes a race condition seen whenever show() is called before the timer in hide() triggers. This can happen
for example if the user hits "Emergency Dial" followed by the back button before the 0.5s timeout completes. The result
is a blank screen with no keyguard view and no means to recover on devices w/o a keyboard.
The bug caused us to sometimes remove the newly created KeyguardView instead of the old one, leaving the view empty.
The fix is to always remove the last view.
The lock screen's flag to force the status bar on was sometimes
interfering with the flag of the alarm behind to hide the lock screen.
Change-Id: I91368c56d09d35b03db548530aa1eb59197206bd
This ensures that the keyguard is fully displayed before the processor suspends,
which avoids a race condition when the device is powered back up.
Fixes one instance of bug b/2164183
Change-Id: Ifd7f928068cf779ec725937db82af69306c02107
Signed-off-by: Mike Lockwood <lockwood@android.com>
Update LockScreen to implement the latest RotarySelector
OnDialTriggerListener interface. In a followup CL we'll use this to
display onscreen hint text while dragging.
BUG=2158434
DRNO=timsullivan
TESTED=exercised the lock screen widget, confirmed there's no new behavior.
Merge commit 'fcb96b2f8762276b1d3a38fb1b73eda977348e0f'
* commit 'fcb96b2f8762276b1d3a38fb1b73eda977348e0f':
Move status bar disabling from KeyguardViewMediator to Phone app
