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.
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 '1f3306c4ca3bc6d291c6634ba9c19c801b46b05d' into eclair-mr2-plus-aosp
* commit '1f3306c4ca3bc6d291c6634ba9c19c801b46b05d':
Do not apply keyguard's short timeout when the keyguard is hidden by another window.
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 '3f5c8c99e20b1b357551b062fad6d5885bc11c89' into eclair-mr2-plus-aosp
* commit '3f5c8c99e20b1b357551b062fad6d5885bc11c89':
Fix 2129239: Add an override method for enabling the menu key on signed builds.
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 '52a0162bfb08faaf93668f80fd66d269414f9eab' into eclair-mr2-plus-aosp
* commit '52a0162bfb08faaf93668f80fd66d269414f9eab':
Fix 2201413: Enable login on Passion when there's no SIM
Merge commit '05d7619df5bc255ef8288bb63989995f4a98b50b' into eclair-mr2-plus-aosp
* commit '05d7619df5bc255ef8288bb63989995f4a98b50b':
Fix for 2201954: Disable haptic feedback for hard keys while keyguard is showing
Merge commit '20618b1f798e5ead160e6be8f7d82117a26cf7cc' into eclair-mr2-plus-aosp
* commit '20618b1f798e5ead160e6be8f7d82117a26cf7cc':
When phone is ringing, power button should only mute the ringer, not hang up.
Merge commit 'ec7dab76d41f07d88fc3e8932c430ef7d50fb5a7' into eclair-mr2-plus-aosp
* commit 'ec7dab76d41f07d88fc3e8932c430ef7d50fb5a7':
When phone is ringing, power button should hang up phone in addition to turning off the screen.
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.
