Merge commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-mr2
* commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
Filter out minor Connectivity Notifications.
Merge commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-plus-aosp
* commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
Filter out minor Connectivity Notifications.
Merge commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61'
* commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61':
move event log tags used by ActivityManager into this package
Merge commit '32c66ee4976857c0db80ebfcfe42d7627dc9d2a2'
* commit '32c66ee4976857c0db80ebfcfe42d7627dc9d2a2':
If the usage stats file doesn't exist in the first place there is no need to
Don't send a connectivity change notification if the change is in detailed state only.
IE, Disconnect/Idle -> Disconnect/Scanning should not trigger a connection change
notification.
bug: 2265222
Merge commit 'f6683bb5592825a62e30760abb0734deaaf7bd93' into eclair-mr2-plus-aosp
* commit 'f6683bb5592825a62e30760abb0734deaaf7bd93':
move event log tags used by ActivityManager into this package
We can now locate event log tag definitions in individual packages
(and java constants for the tag numbers get auto-generated), so move
all the tags used by the system server into the package.
Merge commit 'ccbf4c282f6d27602896b812485b41b74eaf8c6d' into eclair-mr2-plus-aosp
* commit 'ccbf4c282f6d27602896b812485b41b74eaf8c6d':
If the usage stats file doesn't exist in the first place there is no need to
Merge commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7' into eclair-plus-aosp
* commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7':
If the usage stats file doesn't exist in the first place there is no need to
Merge commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7' into eclair-mr2
* commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7':
If the usage stats file doesn't exist in the first place there is no need to
Merge commit '48476b0ade7594a64612db2b867792737193b2ec' into eclair-mr2-plus-aosp
* commit '48476b0ade7594a64612db2b867792737193b2ec':
move event log tags used by system server into this package
We can now locate event log tag definitions in individual packages
(and java constants for the tag numbers get auto-generated), so move
all the tags used by the system server into the package.
Merge commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997'
* commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit '11a2853e0196905e25a2dc5c227320688e04e950' into eclair-mr2-plus-aosp
* commit '11a2853e0196905e25a2dc5c227320688e04e950':
Add support for Car Dock.
Merge commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc' into eclair-mr2-plus-aosp
* commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338' into eclair-plus-aosp
* commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338':
Add support for Car Dock.
Merge commit '678c2e35768a5426b4ad8f67c836008e7751a353' into eclair-mr2
* commit '678c2e35768a5426b4ad8f67c836008e7751a353':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit '678c2e35768a5426b4ad8f67c836008e7751a353' into eclair-plus-aosp
* commit '678c2e35768a5426b4ad8f67c836008e7751a353':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit 'a6c4556dea7d498783aff8a38e0e50c2b172beda'
* commit 'a6c4556dea7d498783aff8a38e0e50c2b172beda':
Make the notification panel send the position as well.
Part of a fix for bug b/2300622 (Proximity sensor always blows up the lock screen while in call)
Change-Id: I9ef888638b19540a78a34507d52ff522f505102f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'a8974b637c384d10bac10d94fae7487afdb2c16d' into eclair-mr2-plus-aosp
* commit 'a8974b637c384d10bac10d94fae7487afdb2c16d':
Make the notification panel send the position as well.
Merge commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a' into eclair-plus-aosp
* commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a':
Make the notification panel send the position as well.
Merge commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a' into eclair-mr2
* commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a':
Make the notification panel send the position as well.
Merge commit 'f72fb68bf32014b075fe577c8495c2c8a86476a9' into eclair-mr2-plus-aosp
* commit 'f72fb68bf32014b075fe577c8495c2c8a86476a9':
Implement new notification LED blinking logic:
Merge commit '9b7dba936c24fa7959561ddf1a0c8ba4d2165782' into eclair-plus-aosp
* commit '9b7dba936c24fa7959561ddf1a0c8ba4d2165782':
Implement new notification LED blinking logic:
1) Do not pulse notification LED when screen is on.
2) Pulse once on new notification if Settings.System.NOTIFICATION_LIGHT_PULSE is false,
otherwise pulse persistently while screen is off.
Fixes part of bug b/2238250 (trackball should pulse occasionally to indicate new email)
Change-Id: Icc49422a4e9d14412fc159a8e2596503a85bac51
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '8fcb312f6ca409ca46812303a405e3403fe71e9a'
* commit '8fcb312f6ca409ca46812303a405e3403fe71e9a':
Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
Merge commit 'e77d40834589ec70abcf71d93a82d24ca6e5535b'
* commit 'e77d40834589ec70abcf71d93a82d24ca6e5535b':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Merge commit 'c1bb46e9d58f05449d8420c81f5cae06e1084ac2' into eclair-mr2-plus-aosp
* commit 'c1bb46e9d58f05449d8420c81f5cae06e1084ac2':
Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
Merge commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565' into eclair-mr2-plus-aosp
* commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Merge commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6' into eclair-mr2
* commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6':
Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
