Fixes b/2267046 (Could not shut off alarm; then device reboot)
Change-Id: Id8f3e24edc5e1242a39c5d43bd549b5cb05abb36
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'a7a4e518a61dc09e281d1072fca8ccca864d289a' into eclair-mr2
* commit 'a7a4e518a61dc09e281d1072fca8ccca864d289a':
Fix 2209086: Fix missing callback that was preventing right tab bar text from updating.
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
Merge commit '1d697192404e3f556b8e87c9f048f16cb3256608' into eclair-mr2
* commit '1d697192404e3f556b8e87c9f048f16cb3256608':
Don't trigger user activity in screenOnStoppedLw() if the screen is off.
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>
Merge commit 'c5eb3fa4bdce22c15f4fef74a51a293399f9a980' into eclair-mr2
* commit 'c5eb3fa4bdce22c15f4fef74a51a293399f9a980':
Use new date format for lock screen.
Fixes http://b/issue?id=2247356 (well, it will once the
format is updated to include the full day-of-week).
Change-Id: Iaafbc60b7ff3edbfee7208052ecc1575cb8c226c
Merge commit '96757ff1498345bef8735791da1ca147b2247f13' into eclair-mr2
* commit '96757ff1498345bef8735791da1ca147b2247f13':
Update LockScreen/UnlockScreen for new UX designs.
Merge commit '07fba524a1dfa1a53b417a3e59c1a4797c49a9eb' into eclair-mr2
* commit '07fba524a1dfa1a53b417a3e59c1a4797c49a9eb':
Fix 2209086: Update sound states in LockScreen.
Merge commit '9ea1107df165518909883429fb5cf20fce7a81e6' into eclair-mr2
* commit '9ea1107df165518909883429fb5cf20fce7a81e6':
Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Merge commit 'c6e1493f164d62f7dc99a5a9df6a064c054b219f' into eclair-mr2
* commit 'c6e1493f164d62f7dc99a5a9df6a064c054b219f':
Restore short screen timeout when keyguard is unhidden.
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>
Merge commit '68569321db63908a8531ff1b8ae7f9a3610d3337' into eclair-mr2
* commit '68569321db63908a8531ff1b8ae7f9a3610d3337':
Do not apply keyguard's short timeout when the keyguard is hidden by another window.
Merge commit '4ca21590d8b5615e6ec302c41868a40417c1d33a' into eclair-mr2
* commit '4ca21590d8b5615e6ec302c41868a40417c1d33a':
Fix 2129239: Add an override method for enabling the menu key on signed builds.
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.
Merge commit '7526eb404a652e2ca9beddd79eb672a7f1069574' into eclair-mr2
* commit '7526eb404a652e2ca9beddd79eb672a7f1069574':
Fix 2201413: Enable login on Passion when there's no SIM
Merge commit '3179826b1694e89ab48a487a41cf20a8d84b7822' into eclair-mr2
* commit '3179826b1694e89ab48a487a41cf20a8d84b7822':
Fix for 2201954: Disable haptic feedback for hard keys while keyguard is showing
Merge commit 'b17c86966b29f3b2604bc256c3ee056576133a03' into eclair-mr2
* commit 'b17c86966b29f3b2604bc256c3ee056576133a03':
When phone is ringing, power button should only mute the ringer, not hang up.
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>
Merge commit '146ef723bc0fc87aba00400196a5e64ab128ee17' into eclair-mr2
* commit '146ef723bc0fc87aba00400196a5e64ab128ee17':
When phone is ringing, power button should hang up phone in addition to turning off the screen.
Merge commit 'd6adf0ae620ca3b64eee38cd53aaeedb7bd98457' into eclair-mr2
* commit 'd6adf0ae620ca3b64eee38cd53aaeedb7bd98457':
Disable key repeats when the screen is off.
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>
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>
