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
Merge commit '515c82cdde6334778d8a75a7ad0bbb97271bed88'
* commit '515c82cdde6334778d8a75a7ad0bbb97271bed88':
Add some logging to help diagnose b/2164183
Merge commit 'a95e1cd1f846a949663e33e5a93f689702415b5a'
* commit 'a95e1cd1f846a949663e33e5a93f689702415b5a':
Work on issue #2163789: Way too much logging
Merge commit '84ec90cbdf950bfa129c30d504f117178c3e3ade'
* commit '84ec90cbdf950bfa129c30d504f117178c3e3ade':
Fix for 2129239: Always enable the menu hard key in LockScreen when 'ro.monkey' is set.
Merge commit 'dafe18ee8c8d7923580b0d6d03d44ffdb00372e6'
* commit 'dafe18ee8c8d7923580b0d6d03d44ffdb00372e6':
Make sure we wake up the screen if the keyguard is not visible when we think it should be.
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.
