Merge commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f' into eclair-mr2
* commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f':
Do not show keyguard if screen is turned off by proximity sensor.
(We were trying to place the emergency call button beneath a
layout object that no longer exists, which is why it was
showing up at the top of the screen on top of other things.)
Change-Id: I10b8b90f0e5923edf5d672b822ee8da6e28933d2
Fixes bug b/2300622 (Proximity sensor always blows up the lock screen while in call)
Change-Id: I85572973c142a72b3bba0bb032e5d2f710b5e36c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '15ee33d4d475dc31709808a64120e56d555e992e' into eclair-mr2
* commit '15ee33d4d475dc31709808a64120e56d555e992e':
Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."
Merge commit 'e7ef42416088235d9e220e3b031d4f612f436a06' into eclair-mr2
* commit 'e7ef42416088235d9e220e3b031d4f612f436a06':
Fix volume keys when in-call and screen is off due to proximity sensor.
Merge commit 'b684251e8f1e85ea9483af2b80bc92f0fd8ded1c' into eclair-mr2
* commit 'b684251e8f1e85ea9483af2b80bc92f0fd8ded1c':
Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.
Fixes bug b/2297262 (Volume keys on passion don't work while in-call and phone is pressed to my ear)
Change-Id: I775daa24295482000f87273d1f84dd796fb0f4eb
Signed-off-by: Mike Lockwood <lockwood@android.com>
Fixes b/2297221 ('Add call' button has no action, if call is answered on lockpattern screen)
Change-Id: I6df8f64dedc4d2d8b02f746213c7b1b336d6560e
Signed-off-by: Mike Lockwood <lockwood@android.com>
When the screen is off keyguard is open but hidden by another activity
make sure that non-waking events like volume key or track ball press
do not turn the screen back on.
Change-Id: Ie6b191360b903b54388a6f65680ccc3264a51dd8
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '760d266a4195db5f3f3dee94be9e0c020cf4051f' into eclair-mr2
* commit '760d266a4195db5f3f3dee94be9e0c020cf4051f':
Fix 2270597: Add callback to watch ringer state and update lock screen UI when it changes.
Merge commit '5da799e012cc4427a4f656e2416bcd73c22acd83' into eclair-mr2
* commit '5da799e012cc4427a4f656e2416bcd73c22acd83':
Bug 2248173 - Tell listeners to ACTION_CLOSE_SYSTEM_DIALOGS that we're doing so because of the home
Fixes b/2215112 (When screen wakes to Playback screen, Notification Bar is active)
Change-Id: I43a8574259788d983c30b1a22e5bfc4e95d09bee
Signed-off-by: Mike Lockwood <lockwood@android.com>
We now treat the case where the lock screen is hidden to be basically the same as
it being removed for purposes of event dispatching and other things in the policy.
Change-Id: I7386220594ad6e89e1493d643b1f0603663ae72a
Fixes b/2267046 (Could not shut off alarm; then device reboot)
Change-Id: Id8f3e24edc5e1242a39c5d43bd549b5cb05abb36
Signed-off-by: Mike Lockwood <lockwood@android.com>
The fix is in LockPatternKeyguardView, whose constructor was
firing off an asynchronous request to the AccountManager to
find out about the specifics of the account on the device.
(If it's SAML, we don't have the password in cleartext and
therefore can't use it to unlock.) Unfortunately, if the
AccountManager responds too quickly, we get the answer (in
LPKV.run()) before the UnlockScreen has even been
instantiated (later in LPKV's ctor).
The fix is to create the unlock screen first and *then* ping
the AccountManager for details.
Bug: http://b/2216308
Change-Id: Iedc84675c0ab8a001d062d806e2bee7ed1a29758
Fixes b/2260437 (device wakes itself back up when camera is last application running)
Change-Id: Icdb3d0369df752a3838fa8e58c7a4bb08efe00a6
Signed-off-by: Mike Lockwood <lockwood@android.com>
Fixes http://b/issue?id=2247356 (well, it will once the
format is updated to include the full day-of-week).
Change-Id: Iaafbc60b7ff3edbfee7208052ecc1575cb8c226c
This is part of a fix for bug b/2248320 (Lock screen does not time out after 5 seconds, after call-decline)
Change-Id: I9ad8cc54fe50d8c9862eec27341fabbd0e871bdd
Signed-off-by: Mike Lockwood <lockwood@android.com>
There are now 3 ways to enable the menu key:
- by config file (config_disableMenuKeyInLockScreen)
- by 'adb shell setprop ro.monkey=1' (for automated testing on userdebug builds)
- by creating file '/data/local/enable_menu_key (for automated testing on signed user builds)
Security: this only affects the insecure lock screen (not lock pattern) which is generally enabled.
Fixes my previous fix for bug b/2201585 (Pressing power button when phone ringing should mute ringer)
Change-Id: I9460e21245b9719f715818f7ad878b121857d773
Signed-off-by: Mike Lockwood <lockwood@android.com>
Fixes bug b/2201585 (Pressing power button when phone ringing should mute ringer)
Change-Id: Ief3e26044f9b0ceaf41c5dc6be52f0d1e9897810
Signed-off-by: Mike Lockwood <lockwood@android.com>
This prevents an endless stream of key repeats spamming the keyguard
if a volume key is pressed at the same time you turn off the screen
with the power button.
This is part of a fix for bug b/2198537
Change-Id: I0d7e335fee79cbebba96b2cd908458c3c94c839e
Signed-off-by: Mike Lockwood <lockwood@android.com>
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.
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>
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
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
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
