Merge commit '5736e96001e3c2575117505a8b8891577b61c782' into eclair-mr2-plus-aosp
* commit '5736e96001e3c2575117505a8b8891577b61c782':
Fix 2270597: Add callback to watch ringer state and update lock screen UI when it changes.
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 '6827ece2767dc17995f43cb7d70338dcbbbb05f7' into eclair-mr2-plus-aosp
* commit '6827ece2767dc17995f43cb7d70338dcbbbb05f7':
Bug 2248173 - Tell listeners to ACTION_CLOSE_SYSTEM_DIALOGS that we're doing so because of the home
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
Merge commit 'aab8769005ed52a3e82aedf8d87c902d762bdb24' into eclair-mr2-plus-aosp
* commit 'aab8769005ed52a3e82aedf8d87c902d762bdb24':
END_BUTTON_BEHAVIOR setting should affect end call button only (not power button)
Merge commit '6b72e9b39642fdff5aef74cd7df2fbd00b9f2257' into eclair-mr2-plus-aosp
* commit '6b72e9b39642fdff5aef74cd7df2fbd00b9f2257':
When keyguard is active, only allow the status bar to be opened if it is insecure and covered by another window.
Fixes b/2215112 (When screen wakes to Playback screen, Notification Bar is active)
Change-Id: I43a8574259788d983c30b1a22e5bfc4e95d09bee
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '9e15ab773940a3e1315cd0cce6bf8e394ce2c3f6' into eclair-mr2-plus-aosp
* commit '9e15ab773940a3e1315cd0cce6bf8e394ce2c3f6':
Fix issue #2264162 and #2252436: Now playing screens problems when locked.
Merge commit 'eb8e950ea446ce6a1b83c565718217d944dd3557' into eclair-mr2
* commit 'eb8e950ea446ce6a1b83c565718217d944dd3557':
Fix issue #2264162 and #2252436: Now playing screens problems when locked.
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>
Merge commit '3b378c925560eb3f65a93d66fa8cb69582a6ac6a' into eclair-mr2-plus-aosp
* commit '3b378c925560eb3f65a93d66fa8cb69582a6ac6a':
Fix 2209086: Fix missing callback that was preventing right tab bar text from updating.
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 '28d2c23065e33c148513affd636ab6ee047d6350' into eclair-mr2-plus-aosp
* commit '28d2c23065e33c148513affd636ab6ee047d6350':
Don't trigger user activity in screenOnStoppedLw() if the screen is off.
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 'df54392f846881654a73c8b287cee3c5f299d31e' into eclair-mr2-plus-aosp
* commit 'df54392f846881654a73c8b287cee3c5f299d31e':
Use new date format for lock screen.
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 'aacaf48e4d5413e8e6357cdab130f3758c0d79fc' into eclair-mr2-plus-aosp
* commit 'aacaf48e4d5413e8e6357cdab130f3758c0d79fc':
Update LockScreen/UnlockScreen for new UX designs.
Merge commit '96757ff1498345bef8735791da1ca147b2247f13' into eclair-mr2
* commit '96757ff1498345bef8735791da1ca147b2247f13':
Update LockScreen/UnlockScreen for new UX designs.
Merge commit '9191a181cceca9030250dd93b0734ac108e438d6' into eclair-mr2-plus-aosp
* commit '9191a181cceca9030250dd93b0734ac108e438d6':
Fix 2209086: Update sound states in LockScreen.
Merge commit '07fba524a1dfa1a53b417a3e59c1a4797c49a9eb' into eclair-mr2
* commit '07fba524a1dfa1a53b417a3e59c1a4797c49a9eb':
Fix 2209086: Update sound states in LockScreen.
Merge commit '387c66eb290a65592cc5f8bfd2ad6a609be95b16' into eclair-mr2-plus-aosp
* commit '387c66eb290a65592cc5f8bfd2ad6a609be95b16':
Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Merge commit '9ea1107df165518909883429fb5cf20fce7a81e6' into eclair-mr2
* commit '9ea1107df165518909883429fb5cf20fce7a81e6':
Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Merge commit '52e3b17e5f913e8f2fcb979ea38b6cb6aa3d0015' into eclair-mr2-plus-aosp
* commit '52e3b17e5f913e8f2fcb979ea38b6cb6aa3d0015':
Restore short screen timeout when keyguard is unhidden.
