Merge commit '48515f495b29c01b473579825d5ba5e690ff5db7' into eclair-plus-aosp
* commit '48515f495b29c01b473579825d5ba5e690ff5db7':
Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
Make sure to deliver events to the wallpaper until the final up.
Also fix behavior in the case where a window goes away while the pointer is still
down in it, which is a fairly novel situation introduced by the new lock screen.
Also add infrastructure for delivering motion events during preview.
Change-Id: I0de7979be27e00caf0b1eff794ea899a815142f6
Merge commit 'e93f49b7ff34b1f8c689b6a3ed85ef92b64d094a' into eclair-mr2-plus-aosp
* commit 'e93f49b7ff34b1f8c689b6a3ed85ef92b64d094a':
Add support for specifying the current LCD brightness mode to the backlight driver.
Merge commit 'cc9a63dbc2b5569ef65ec3a04d86dbdfdee3f134' into eclair-plus-aosp
* commit 'cc9a63dbc2b5569ef65ec3a04d86dbdfdee3f134':
Add support for specifying the current LCD brightness mode to the backlight driver.
Merge commit 'cc9a63dbc2b5569ef65ec3a04d86dbdfdee3f134' into eclair-mr2
* commit 'cc9a63dbc2b5569ef65ec3a04d86dbdfdee3f134':
Add support for specifying the current LCD brightness mode to the backlight driver.
This allows the driver to behave differently depending on if the lighting is being
managed by the light sensor or by a user preference.
Change-Id: I4b9325f82b7aded0ce5cfc6c07658666bbdae331
Signed-off-by: Mike Lockwood <lockwood@android.com>
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.
Merge commit '50c548d242d637328ec6b2c4987969b02695cc7d' into eclair-plus-aosp
* 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-plus-aosp
* commit 'ee2b094de0c5d7ffa64d51e7bd4ec3238be97113':
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 'de342a01a0272540c8468fcfcf0f0067c0d743e0' into eclair-plus-aosp
* 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 '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-plus-aosp
* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
Add a way for wallpapers to know the delta between virtual screens.
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 'ba8eb1efefdc98c016b64e10c26f9729697f254f' into eclair-mr2
* commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f':
Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit '17479ebe90a5ebd17ee386b8fd83256765afce0b' into eclair-mr2
* commit '17479ebe90a5ebd17ee386b8fd83256765afce0b':
Ignore the light sensor if the screen is turning off.
Merge commit '9882f38584882461dbfef229e4fe316dacebd9c5' into eclair-mr2-plus-aosp
* commit '9882f38584882461dbfef229e4fe316dacebd9c5':
Do not apply light sensor debounce logic while the light sensor is still warming up.
Merge commit '96fce6e112aec1e09c82cfd7657381ce112dc555' into eclair-mr2
* commit '96fce6e112aec1e09c82cfd7657381ce112dc555':
Do not apply light sensor debounce logic while the light sensor is still warming up.
Merge commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f' into eclair-plus-aosp
* commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f':
Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit '17479ebe90a5ebd17ee386b8fd83256765afce0b' into eclair-plus-aosp
* commit '17479ebe90a5ebd17ee386b8fd83256765afce0b':
Ignore the light sensor if the screen is turning off.
Merge commit '96fce6e112aec1e09c82cfd7657381ce112dc555' into eclair-plus-aosp
* commit '96fce6e112aec1e09c82cfd7657381ce112dc555':
Do not apply light sensor debounce logic while the light sensor is still warming up.
when processing light and proximity events.
This should fix loss of 2 second hysterisis for light sensor (b/2243521)
Change-Id: Ia3ce331e67d803eb5e51810cb7161b7c528312d7
Signed-off-by: Mike Lockwood <lockwood@android.com>
Fixes bug b/2202165. The light sensor was interfering with the screen off animation.
Change-Id: I1bc566a164af689b60b066e6cb3dcbf7959bc50a
Signed-off-by: Mike Lockwood <lockwood@android.com>
This allows us to adjust immediately when we receive a correct light sensor reading
after the screen turns on.
Change-Id: I627047365640761727348e577c9164a6d6be2772
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'dc2a3f60f2bed20ceb44d18ae03e75d360de4ca6' into eclair-mr2-plus-aosp
* commit 'dc2a3f60f2bed20ceb44d18ae03e75d360de4ca6':
Increase light sensor delay from one to two seconds.
Merge commit 'b8933665376905c91069eb29fa78c029aa790ce9' into eclair-mr2
* commit 'b8933665376905c91069eb29fa78c029aa790ce9':
Increase light sensor delay from one to two seconds.
Merge commit 'b8933665376905c91069eb29fa78c029aa790ce9' into eclair-plus-aosp
* commit 'b8933665376905c91069eb29fa78c029aa790ce9':
Increase light sensor delay from one to two seconds.
Merge commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356' into eclair-mr2-plus-aosp
* commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356':
Expose PowerManager.isScreenOn in the public api.
Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-plus-aosp
* commit '3cba72880b78b81cda2868136462c9e261a3e403':
Expose PowerManager.isScreenOn in the public api.
Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-mr2
* commit '3cba72880b78b81cda2868136462c9e261a3e403':
Expose PowerManager.isScreenOn in the public api.
Merge commit '0cb3f58741efa2b2b7477cbae973a29e614c62e8' into eclair-mr2-plus-aosp
* commit '0cb3f58741efa2b2b7477cbae973a29e614c62e8':
Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
Merge commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42' into eclair-mr2
* commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42':
Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
Merge commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42' into eclair-plus-aosp
* commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42':
Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
