Merge commit '7777b3459d6b9168336a726fa4cc1a1e9f3d1b6c'
* commit '7777b3459d6b9168336a726fa4cc1a1e9f3d1b6c':
Fix for 2209086: Initial pass at new SlidingTab widget and integration into 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 'e15c0bd374571b3dc059481710c4c8211e81dede'
* commit 'e15c0bd374571b3dc059481710c4c8211e81dede':
Restore short screen timeout when keyguard is unhidden.
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 'da14742dfc0d3ed127033255d7e79fa187225420'
* commit 'da14742dfc0d3ed127033255d7e79fa187225420':
Do not apply keyguard's short timeout when the keyguard is hidden by another window.
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 'bf66257361cf005201e7bf701d18b85b23b3d7cf'
* commit 'bf66257361cf005201e7bf701d18b85b23b3d7cf':
Fix 2129239: Add an override method for enabling the menu key on signed builds.
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 '1f8bef66465a20eb63dad125ee86d7fa53554aaf'
* commit '1f8bef66465a20eb63dad125ee86d7fa53554aaf':
Fix for 2201954: Disable haptic feedback for hard keys while keyguard is showing
Merge commit '535cc39aa7e6b13ffd53160c242361f8462ebc33'
* commit '535cc39aa7e6b13ffd53160c242361f8462ebc33':
When phone is ringing, power button should only mute the ringer, not hang up.
Merge commit '5bcd4380b4d4a322895c39685df1c88e342f6ded'
* commit '5bcd4380b4d4a322895c39685df1c88e342f6ded':
When phone is ringing, power button should hang up phone in addition to turning off the screen.
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.
Merge commit '18ff921436a8e67c94b3bae45bb3e1d87f63aebd'
* commit '18ff921436a8e67c94b3bae45bb3e1d87f63aebd':
Disable key repeats when the screen is off.
Merge commit '65fb72a42ca01124beea8d4a4b9ee0326cfe5e1c' into eclair-mr2-plus-aosp
* commit '65fb72a42ca01124beea8d4a4b9ee0326cfe5e1c':
Disable key repeats when the screen is off.
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 '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
