Merge commit '07e7e3f4be8fac3b7b6b2bea492429d66fbb0a9c' into eclair-mr2-plus-aosp
* commit '07e7e3f4be8fac3b7b6b2bea492429d66fbb0a9c':
Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
Merge commit '50c548d242d637328ec6b2c4987969b02695cc7d' into eclair-mr2
* commit '50c548d242d637328ec6b2c4987969b02695cc7d':
Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
This is part of a fix for bug b/2248320 (Lock screen does not time out after
Change-Id: Iba7f8a7b9997ecb0e4da37667600055f9a35531c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '245eaeedf873c5c60e1ad442d2290c108336fb67' into eclair-mr2-plus-aosp
* commit '245eaeedf873c5c60e1ad442d2290c108336fb67':
Do not deactivate the proximity sensor until after the sensor returns negative.
Merge commit 'ee2b094de0c5d7ffa64d51e7bd4ec3238be97113' into eclair-mr2
* commit 'ee2b094de0c5d7ffa64d51e7bd4ec3238be97113':
Do not deactivate the proximity sensor until after the sensor returns negative.
This ensures that we do not get cheek presses immediately after a call is ended.
Fixes bug b/2246824 (prox sensor subtleties when call ends)
Change-Id: I97d39b7689d9ea2e94ea9aceeb93bf15228ec095
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'e4fed7dc2465726892da426ae193bbec9a34d554' into eclair-mr2-plus-aosp
* commit 'e4fed7dc2465726892da426ae193bbec9a34d554':
PowerManagerService: enable logging for when mPowerState changes.
Merge commit 'de342a01a0272540c8468fcfcf0f0067c0d743e0' into eclair-mr2
* commit 'de342a01a0272540c8468fcfcf0f0067c0d743e0':
PowerManagerService: enable logging for when mPowerState changes.
Merge commit '949ffa3da5231772425c3bde50caeab6c4d08ec5' into eclair-mr2-plus-aosp
* commit '949ffa3da5231772425c3bde50caeab6c4d08ec5':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-mr2
* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit 'aa10b9fb52db88e3cc9045019f42fa83e9da9868' into eclair-mr2-plus-aosp
* commit 'aa10b9fb52db88e3cc9045019f42fa83e9da9868':
Support for fallback fonts in layoutlib.
Merge commit 'e6ab011b8b8aa6c461e64cabb9b25d890d68edb1' into eclair-mr2
* commit 'e6ab011b8b8aa6c461e64cabb9b25d890d68edb1':
Support for fallback fonts in layoutlib.
Merge commit '452a52968f43c21e9a040009e209df023a34876c' into eclair-mr2-plus-aosp
* commit '452a52968f43c21e9a040009e209df023a34876c':
Make vCard exporter check invalid phone numbers and re-format them if needed.
Merge commit '61a2c04ffedfcd963b1b8bcb310ab12b0d7e9dd4' into eclair-mr2-plus-aosp
* commit '61a2c04ffedfcd963b1b8bcb310ab12b0d7e9dd4':
Add new notifications and ringtones.
Merge commit 'feafc202bbfd768423326aeb0faafaee3f348bb6' into eclair-mr2-plus-aosp
* commit 'feafc202bbfd768423326aeb0faafaee3f348bb6':
Fix the selection of locale from SIM mcc.
Merge commit '756e75cfcfbd5b311167de9661a1e3376dd4c4db' into eclair-mr2-plus-aosp
* commit '756e75cfcfbd5b311167de9661a1e3376dd4c4db':
AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
Merge commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525' into eclair-mr2-plus-aosp
* commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525':
Fix code example in Parcelable javadoc
Merge commit '05388e454b9d5c6e3af0ca4b6d6e62f2352f6b19' into eclair-mr2-plus-aosp
* commit '05388e454b9d5c6e3af0ca4b6d6e62f2352f6b19':
More log for issue 2242381.
Merge commit '6bfd8d2a31037716f2e0964625807fc7b8e90e92' into eclair-mr2-plus-aosp
* commit '6bfd8d2a31037716f2e0964625807fc7b8e90e92':
Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit '149f6710f774f36570de7be8ffa3dd6e8194a11d' into eclair-mr2-plus-aosp
* commit '149f6710f774f36570de7be8ffa3dd6e8194a11d':
Ignore the light sensor if the screen is turning off.
Merge commit '3ea2ae7d6f8a73947831c15f970de70730c5a0f6' into eclair-mr2
* commit '3ea2ae7d6f8a73947831c15f970de70730c5a0f6':
Add new notifications and ringtones.
Merge commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837' into eclair-mr2
* commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837':
Fix the selection of locale from SIM mcc.
Merge commit '090c60bb9d6608df4a8d753fc91974fe2c49c262' into eclair-mr2
* commit '090c60bb9d6608df4a8d753fc91974fe2c49c262':
AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
Merge commit '2bb53754337225508f2b4d12f1575df7c226100c' into eclair-mr2
* commit '2bb53754337225508f2b4d12f1575df7c226100c':
Fix code example in Parcelable javadoc
Merge commit '93572eef41f94f023037482f194db0ab07d0c33a' into eclair-mr2
* commit '93572eef41f94f023037482f194db0ab07d0c33a':
More log for issue 2242381.
