1500 Commits

Author SHA1 Message Date
Mike Lockwood
ee2b094de0 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>
2009-11-10 07:55:32 -05:00
Mike Lockwood
5747e11ca0 am e4fed7dc: am de342a01: Merge change Idcd98310 into eclair
Merge commit 'e4fed7dc2465726892da426ae193bbec9a34d554' into eclair-mr2-plus-aosp

* commit 'e4fed7dc2465726892da426ae193bbec9a34d554':
  PowerManagerService: enable logging for when mPowerState changes.
2009-11-10 04:41:07 -08:00
Mike Lockwood
e4fed7dc24 am de342a01: Merge change Idcd98310 into eclair
Merge commit 'de342a01a0272540c8468fcfcf0f0067c0d743e0' into eclair-mr2

* commit 'de342a01a0272540c8468fcfcf0f0067c0d743e0':
  PowerManagerService: enable logging for when mPowerState changes.
2009-11-10 04:38:57 -08:00
Mike Lockwood
548816533a am de342a01: Merge change Idcd98310 into eclair
Merge commit 'de342a01a0272540c8468fcfcf0f0067c0d743e0' into eclair-plus-aosp

* commit 'de342a01a0272540c8468fcfcf0f0067c0d743e0':
  PowerManagerService: enable logging for when mPowerState changes.
2009-11-10 04:38:26 -08:00
Android (Google) Code Review
de342a01a0 Merge change Idcd98310 into eclair
* changes:
  PowerManagerService: enable logging for when mPowerState changes.
2009-11-10 04:34:48 -08:00
Marco Nelissen
eac4222f7f am 949ffa3d: am 11cff8cd: Merge change Ie211adae into eclair
Merge commit '949ffa3da5231772425c3bde50caeab6c4d08ec5' into eclair-mr2-plus-aosp

* commit '949ffa3da5231772425c3bde50caeab6c4d08ec5':
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:38:31 -08:00
Marco Nelissen
949ffa3da5 am 11cff8cd: Merge change Ie211adae into eclair
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-mr2

* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:34:42 -08:00
Marco Nelissen
47fc5e2a43 am 11cff8cd: Merge change Ie211adae into eclair
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-plus-aosp

* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:34:14 -08:00
Marco Nelissen
bf6956b1d9 Add a way for wallpapers to know the delta between virtual screens. 2009-11-09 17:39:33 -08:00
Mike Lockwood
24ace3395b PowerManagerService: enable logging for when mPowerState changes.
Change-Id: Idcd983106d66629070eda15e1160f708c789ab05
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-09 19:54:02 -05:00
Mike Lockwood
6a3f9e24b6 am 6bfd8d2a: am ba8eb1ef: Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit '6bfd8d2a31037716f2e0964625807fc7b8e90e92' into eclair-mr2-plus-aosp

* commit '6bfd8d2a31037716f2e0964625807fc7b8e90e92':
  Use SystemClock.elapsedRealtime() instead of sensor timestamp
2009-11-09 16:24:15 -08:00
Mike Lockwood
e59631b601 am 149f6710: am 17479ebe: Merge change I1bc566a1 into eclair
Merge commit '149f6710f774f36570de7be8ffa3dd6e8194a11d' into eclair-mr2-plus-aosp

* commit '149f6710f774f36570de7be8ffa3dd6e8194a11d':
  Ignore the light sensor if the screen is turning off.
2009-11-09 16:24:04 -08:00
Mike Lockwood
6bfd8d2a31 am ba8eb1ef: Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f' into eclair-mr2

* commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f':
  Use SystemClock.elapsedRealtime() instead of sensor timestamp
2009-11-09 16:14:26 -08:00
Mike Lockwood
149f6710f7 am 17479ebe: Merge change I1bc566a1 into eclair
Merge commit '17479ebe90a5ebd17ee386b8fd83256765afce0b' into eclair-mr2

* commit '17479ebe90a5ebd17ee386b8fd83256765afce0b':
  Ignore the light sensor if the screen is turning off.
2009-11-09 16:14:14 -08:00
Alexey Tarasov
f2db9fb0f8 Typo fix in javadoc
@throw -> @throws
@Deprecated -> @deprecated
2009-11-09 16:07:14 -08:00
Mike Lockwood
65fac51faf am 9882f385: am 96fce6e1: Merge change I62704736 into eclair
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.
2009-11-09 12:15:04 -08:00
Mike Lockwood
9882f38584 am 96fce6e1: Merge change I62704736 into eclair
Merge commit '96fce6e112aec1e09c82cfd7657381ce112dc555' into eclair-mr2

* commit '96fce6e112aec1e09c82cfd7657381ce112dc555':
  Do not apply light sensor debounce logic while the light sensor is still warming up.
2009-11-09 12:07:05 -08:00
Mike Lockwood
f10be63099 am ba8eb1ef: Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f' into eclair-plus-aosp

* commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f':
  Use SystemClock.elapsedRealtime() instead of sensor timestamp
2009-11-09 11:55:00 -08:00
Mike Lockwood
3e06771680 am 17479ebe: Merge change I1bc566a1 into eclair
Merge commit '17479ebe90a5ebd17ee386b8fd83256765afce0b' into eclair-plus-aosp

* commit '17479ebe90a5ebd17ee386b8fd83256765afce0b':
  Ignore the light sensor if the screen is turning off.
2009-11-09 11:54:50 -08:00
Mike Lockwood
34894fb43e am 96fce6e1: Merge change I62704736 into eclair
Merge commit '96fce6e112aec1e09c82cfd7657381ce112dc555' into eclair-plus-aosp

* commit '96fce6e112aec1e09c82cfd7657381ce112dc555':
  Do not apply light sensor debounce logic while the light sensor is still warming up.
2009-11-09 11:54:18 -08:00
Mike Lockwood
ba8eb1efef Use SystemClock.elapsedRealtime() instead of sensor timestamp
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>
2009-11-08 19:31:18 -05:00
Mike Lockwood
497087e33d Ignore the light sensor if the screen is turning off.
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>
2009-11-08 18:43:12 -05:00
Mike Lockwood
20ee6f2dd3 Do not apply light sensor debounce logic while the light sensor is still warming up.
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>
2009-11-07 20:33:47 -05:00
Mike Lockwood
4335552259 am dc2a3f60: am b8933665: Merge change I3f0ded49 into eclair
Merge commit 'dc2a3f60f2bed20ceb44d18ae03e75d360de4ca6' into eclair-mr2-plus-aosp

* commit 'dc2a3f60f2bed20ceb44d18ae03e75d360de4ca6':
  Increase light sensor delay from one to two seconds.
2009-11-06 13:35:09 -08:00
Mike Lockwood
dc2a3f60f2 am b8933665: Merge change I3f0ded49 into eclair
Merge commit 'b8933665376905c91069eb29fa78c029aa790ce9' into eclair-mr2

* commit 'b8933665376905c91069eb29fa78c029aa790ce9':
  Increase light sensor delay from one to two seconds.
2009-11-06 13:23:05 -08:00
Mike Lockwood
fe84a0cfbf am b8933665: Merge change I3f0ded49 into eclair
Merge commit 'b8933665376905c91069eb29fa78c029aa790ce9' into eclair-plus-aosp

* commit 'b8933665376905c91069eb29fa78c029aa790ce9':
  Increase light sensor delay from one to two seconds.
2009-11-06 13:02:54 -08:00
Mike Lockwood
9b813692f5 Increase light sensor delay from one to two seconds.
Change-Id: I3f0ded49cb447835133cf8d5d693260e8312aa89
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-06 15:53:59 -05:00
Charles Mendis
7e3873a0d2 am 6b07bf3d: am 3cba7288: Merge change I6ccd2ebc into eclair
Merge commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356' into eclair-mr2-plus-aosp

* commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356':
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 11:54:49 -08:00
Charles Mendis
d1c0ecae60 am 3cba7288: Merge change I6ccd2ebc into eclair
Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-plus-aosp

* commit '3cba72880b78b81cda2868136462c9e261a3e403':
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 11:47:57 -08:00
Charles Mendis
6b07bf3d8f am 3cba7288: Merge change I6ccd2ebc into eclair
Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-mr2

* commit '3cba72880b78b81cda2868136462c9e261a3e403':
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 11:46:43 -08:00
Charles Mendis
322591cb4b Expose PowerManager.isScreenOn in the public api.
Change-Id: I6ccd2ebcbf3f8ad9ffa4b86a9c037cb0c25a7b78
2009-11-06 14:37:07 -05:00
Mike Lockwood
bd2473a9aa am 0cb3f587: am 0d72f7e9: Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
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.
2009-11-06 10:17:14 -08:00
Mike Lockwood
0cb3f58741 am 0d72f7e9: 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.
2009-11-06 05:35:04 -08:00
Mike Lockwood
0bb02894a4 am 0d72f7e9: 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.
2009-11-06 05:34:44 -08:00
Mike Lockwood
0d72f7e9fc Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
This should fix a "black screen" bug that Motorola identified.
mProximitySensorActive was being set to true due to a proximity sensor change being posted
just after we disabled the proximity sensor.
Now we ignore proximity changes after the phone app releases the proximity lock after the call is done.

Change-Id: I417d423de3d43515389b1b7b008cdcb795cd10f6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-06 08:28:19 -05:00
Suchi Amalapurapu
972bad3cb8 am 750e82e5: am bf50200b: Merge change Ic9568e39 into eclair
Merge commit '750e82e51921428dc4ad9a75f18b02b8048734d8' into eclair-mr2-plus-aosp

* commit '750e82e51921428dc4ad9a75f18b02b8048734d8':
  When tasks are moved to top or bottom, the app tokens are being rearranged.
2009-11-06 00:30:40 -08:00
Suchi Amalapurapu
750e82e519 am bf50200b: Merge change Ic9568e39 into eclair
Merge commit 'bf50200ba494db0ac2ce655a95f76640f49355ee' into eclair-mr2

* commit 'bf50200ba494db0ac2ce655a95f76640f49355ee':
  When tasks are moved to top or bottom, the app tokens are being rearranged.
2009-11-06 00:23:03 -08:00
Suchi Amalapurapu
7442abf98e am bf50200b: Merge change Ic9568e39 into eclair
Merge commit 'bf50200ba494db0ac2ce655a95f76640f49355ee' into eclair-plus-aosp

* commit 'bf50200ba494db0ac2ce655a95f76640f49355ee':
  When tasks are moved to top or bottom, the app tokens are being rearranged.
2009-11-05 23:19:42 -08:00
Mike Lockwood
e0c1bc9834 am b31174de: am 9ce3df55: Merge change I2c6e54e4 into eclair
Merge commit 'b31174de6a3d5ba39ccea02c9b653ea4f950bb89' into eclair-mr2-plus-aosp

* commit 'b31174de6a3d5ba39ccea02c9b653ea4f950bb89':
  Throttle proximity sensor values so we do not process more than one change a second.
2009-11-05 20:37:20 -08:00
Mike Lockwood
b31174de6a am 9ce3df55: Merge change I2c6e54e4 into eclair
Merge commit '9ce3df55bab12bea563faf764f7beb3555d5942c' into eclair-mr2

* commit '9ce3df55bab12bea563faf764f7beb3555d5942c':
  Throttle proximity sensor values so we do not process more than one change a second.
2009-11-05 20:26:44 -08:00
Suchi Amalapurapu
c9568e3989 When tasks are moved to top or bottom, the app tokens are being rearranged.
The window token rearrangement is defered if an animation is
underway. Force a focus recomputation when the window tokens are finally
rearranged so that we have a valid focused window.
2009-11-05 19:13:18 -08:00
Mike Lockwood
d7f852488b am 9ce3df55: Merge change I2c6e54e4 into eclair
Merge commit '9ce3df55bab12bea563faf764f7beb3555d5942c' into eclair-plus-aosp

* commit '9ce3df55bab12bea563faf764f7beb3555d5942c':
  Throttle proximity sensor values so we do not process more than one change a second.
2009-11-05 17:38:12 -08:00
Android (Google) Code Review
9ce3df55ba Merge change I2c6e54e4 into eclair
* changes:
  Throttle proximity sensor values so we do not process more than one change a second.
2009-11-05 20:29:54 -05:00
Android Code Review
8d9ef03611 Merge change I8f67f092
* changes:
  Fix of compatibility with multifunction extUSB adapters. Tested with HTC YC A300.
2009-11-05 14:08:25 -08:00
Amith Yamasani
9d216dfd51 am 7b2aa74f: am 4ab2c777: Merge change I14fb81af into eclair
Merge commit '7b2aa74f4644979acea456e1047c96e17e09bc6d' into eclair-mr2-plus-aosp

* commit '7b2aa74f4644979acea456e1047c96e17e09bc6d':
  Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
2009-11-05 14:05:38 -08:00
Amith Yamasani
7b2aa74f46 am 4ab2c777: Merge change I14fb81af into eclair
Merge commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e' into eclair-mr2

* commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e':
  Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
2009-11-05 13:55:33 -08:00
Amith Yamasani
99b5f8cf69 am 4ab2c777: Merge change I14fb81af into eclair
Merge commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e' into eclair-plus-aosp

* commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e':
  Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
2009-11-05 13:16:40 -08:00
Mike Lockwood
20f87d7aed Throttle proximity sensor values so we do not process more than one change a second.
This is to prevent a noisy proximity sensor from causing the screen to turn on and off
in rapid succession, which can trigger race conditions in the keyguard manager.

Change-Id: I2c6e54e4b41716e038854ed9a827c901579c8865
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-05 16:13:46 -05:00
Amith Yamasani
14fb81af28 Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
This should remove the deadlock. I'm not absolutely positive that
it fixes it, as it's not easy to reproduce.
2009-11-05 11:41:58 -08:00
Eric Olsen
d6210cdeb7 am e772eb7a: am 62335430: Merge change I4499ad72 into eclair
Merge commit 'e772eb7af049b55c89241fae799569030c1f5570' into eclair-mr2-plus-aosp

* commit 'e772eb7af049b55c89241fae799569030c1f5570':
  Fix bad merge fixes build breakage.
2009-11-04 17:46:35 -08:00