drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,067 Commits 1 Branch 0 Tags
Commit Graph

1750 Commits

Author SHA1 Message Date
Jaikumar Ganesh
11a2853e01 am 8c411fb1: Merge change I79420b02 into eclair 
Merge commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338' into eclair-mr2

* commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338':
  Add support for Car Dock.
 2009-12-03 12:01:38 -08:00
Jaikumar Ganesh
2e1ff896cc am 8c411fb1: Merge change I79420b02 into eclair 
Merge commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338' into eclair-plus-aosp

* commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338':
  Add support for Car Dock.
 2009-12-03 12:01:17 -08:00
Android (Google) Code Review
8c411fb139 Merge change I79420b02 into eclair 
* changes:
  Add support for Car Dock.
 2009-12-03 11:49:38 -08:00
Jaikumar Ganesh
3fbf7b62bb Add support for Car Dock. 
Dr No: Eastham
Bug: 2133530
 2009-12-03 11:35:37 -08:00
Mike Lockwood
44000eb2a2 am 678c2e35: Merge change I9ef88863 into eclair 
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.
 2009-12-03 11:18:48 -08:00
Mike Lockwood
0d26301ba4 am 678c2e35: Merge change I9ef88863 into eclair 
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.
 2009-12-03 11:12:47 -08:00
Joe Onorato
06253f58fb am a6c4556d: am a8974b63: am 19a4157c: Make the notification panel send the position as well. 
Merge commit 'a6c4556dea7d498783aff8a38e0e50c2b172beda'

* commit 'a6c4556dea7d498783aff8a38e0e50c2b172beda':
  Make the notification panel send the position as well.
 2009-12-03 10:54:04 -08:00
Mike Lockwood
435eb6464c Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor. 
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>
 2009-12-03 08:56:53 -05:00
Joe Onorato
a6c4556dea am a8974b63: am 19a4157c: Make the notification panel send the position as well. 
Merge commit 'a8974b637c384d10bac10d94fae7487afdb2c16d' into eclair-mr2-plus-aosp

* commit 'a8974b637c384d10bac10d94fae7487afdb2c16d':
  Make the notification panel send the position as well.
 2009-12-02 23:39:16 -08:00
Joe Onorato
4ceb0f3855 am 19a4157c: 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.
 2009-12-02 23:34:17 -08:00
Joe Onorato
a8974b637c am 19a4157c: 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.
 2009-12-02 23:33:56 -08:00
Joe Onorato
19a4157ce4 Make the notification panel send the position as well. 2009-12-02 23:26:27 -08:00
Dianne Hackborn
f623fbc45d am 1dde14bc: am a45e9251: am dcd58cfd: Merge change I7b9328c7 into eclair 
Merge commit '1dde14bc84e39b81df7108a2d64a7918a97b20df'

* commit '1dde14bc84e39b81df7108a2d64a7918a97b20df':
  Fix issue #2300232: Bugs in resolving conflicting pointers
 2009-12-02 20:49:44 -08:00
Mike Lockwood
af942bf8b3 am cd753d16: am f72fb68b: resolved conflicts for merge of 9b7dba93 to eclair-mr2 
Merge commit 'cd753d168f9d62b6e852c5ab0f61436619085e6f'

* commit 'cd753d168f9d62b6e852c5ab0f61436619085e6f':
  Implement new notification LED blinking logic:
 2009-12-02 20:45:24 -08:00
Dianne Hackborn
8a1b6decfb am e2585127: am 9ed7dc10: am 5886050f: Merge change I0d8f7593 into eclair 
Merge commit 'e2585127974ce972a013407e2af95d8776a99a8e'

* commit 'e2585127974ce972a013407e2af95d8776a99a8e':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
 2009-12-02 20:24:44 -08:00
Dianne Hackborn
1dde14bc84 am a45e9251: am dcd58cfd: Merge change I7b9328c7 into eclair 
Merge commit 'a45e925108f6c9d35d9e7b5e8def9aba49ee0dba' into eclair-mr2-plus-aosp

* commit 'a45e925108f6c9d35d9e7b5e8def9aba49ee0dba':
  Fix issue #2300232: Bugs in resolving conflicting pointers
 2009-12-02 19:01:31 -08:00
Dianne Hackborn
fa99f378f7 am dcd58cfd: Merge change I7b9328c7 into eclair 
Merge commit 'dcd58cfda366c915b1f0739cb115f9d972351c73' into eclair-plus-aosp

* commit 'dcd58cfda366c915b1f0739cb115f9d972351c73':
  Fix issue #2300232: Bugs in resolving conflicting pointers
 2009-12-02 18:56:21 -08:00
Dianne Hackborn
a45e925108 am dcd58cfd: Merge change I7b9328c7 into eclair 
Merge commit 'dcd58cfda366c915b1f0739cb115f9d972351c73' into eclair-mr2

* commit 'dcd58cfda366c915b1f0739cb115f9d972351c73':
  Fix issue #2300232: Bugs in resolving conflicting pointers
 2009-12-02 18:56:20 -08:00
Dianne Hackborn
709d6db48d Fix issue #2300232: Bugs in resolving conflicting pointers 
Change-Id: I7b9328c7a1c4f6b731e64cdca2ed9de71b84587f
 2009-12-02 18:42:39 -08:00
Mike Lockwood
cd753d168f am f72fb68b: resolved conflicts for merge of 9b7dba93 to eclair-mr2 
Merge commit 'f72fb68bf32014b075fe577c8495c2c8a86476a9' into eclair-mr2-plus-aosp

* commit 'f72fb68bf32014b075fe577c8495c2c8a86476a9':
  Implement new notification LED blinking logic:
 2009-12-02 17:51:09 -08:00
Mike Lockwood
f72fb68bf3 resolved conflicts for merge of 9b7dba93 to eclair-mr2 
Change-Id: I9a5412b8812aebc934540b1f6f9a9f9c96d89f59
 2009-12-02 19:57:33 -05:00
Mike Lockwood
fbe460e888 am 9b7dba93: Merge change Icc49422a into eclair 
Merge commit '9b7dba936c24fa7959561ddf1a0c8ba4d2165782' into eclair-plus-aosp

* commit '9b7dba936c24fa7959561ddf1a0c8ba4d2165782':
  Implement new notification LED blinking logic:
 2009-12-02 16:30:30 -08:00
Mike Lockwood
c22404a4e7 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>
 2009-12-02 14:30:13 -05:00
Dianne Hackborn
e258512797 am 9ed7dc10: am 5886050f: Merge change I0d8f7593 into eclair 
Merge commit '9ed7dc10d263a505da32522139098f085fee811a' into eclair-mr2-plus-aosp

* commit '9ed7dc10d263a505da32522139098f085fee811a':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
 2009-12-02 05:35:46 -08:00
Dianne Hackborn
9ed7dc10d2 am 5886050f: Merge change I0d8f7593 into eclair 
Merge commit '5886050fad97923c33cbc831fe07a5b1746b2b58' into eclair-mr2

* commit '5886050fad97923c33cbc831fe07a5b1746b2b58':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
 2009-12-02 05:26:12 -08:00
Mike Lockwood
c8a6379bd4 am 8fcb312f: am c1bb46e9: am abf7fed2: Merge change I2b7c8a32 into eclair 
Merge commit '8fcb312f6ca409ca46812303a405e3403fe71e9a'

* commit '8fcb312f6ca409ca46812303a405e3403fe71e9a':
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
 2009-12-01 18:52:53 -08:00
Eric Laurent
ed2168524b am e77d4083: am 5e392e2b: am bb3bb57a: Merge change I524dc046 into eclair 
Merge commit 'e77d40834589ec70abcf71d93a82d24ca6e5535b'

* commit 'e77d40834589ec70abcf71d93a82d24ca6e5535b':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
 2009-12-01 18:49:50 -08:00
Mike Lockwood
8fcb312f6c am c1bb46e9: am abf7fed2: Merge change I2b7c8a32 into eclair 
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.
 2009-12-01 18:42:55 -08:00
Eric Laurent
e77d408345 am 5e392e2b: am bb3bb57a: Merge change I524dc046 into eclair 
Merge commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565' into eclair-mr2-plus-aosp

* commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
 2009-12-01 18:39:17 -08:00
Mike Lockwood
c1bb46e9d5 am abf7fed2: Merge change I2b7c8a32 into eclair 
Merge commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6' into eclair-mr2

* commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6':
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
 2009-12-01 18:30:12 -08:00
Dianne Hackborn
0b63b9fb56 am 5886050f: Merge change I0d8f7593 into eclair 
Merge commit '5886050fad97923c33cbc831fe07a5b1746b2b58' into eclair-plus-aosp

* commit '5886050fad97923c33cbc831fe07a5b1746b2b58':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
 2009-12-01 17:10:27 -08:00
Eric Laurent
5e392e2b02 am bb3bb57a: Merge change I524dc046 into eclair 
Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-mr2

* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
 2009-12-01 17:04:24 -08:00
Dianne Hackborn
a7ca0e5e32 Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op 
Change-Id: I0d8f75938226e1bb49cf7b1154445631b0bb0bc9
 2009-12-01 14:31:55 -08:00
Mike Lockwood
4cbe8ef11e am 15740edd: am b70da2bb: Merge change I1c281504 into eclair-mr2 
Merge commit '15740edd2ac0026e97699028d07e6b0e773d3643'

* commit '15740edd2ac0026e97699028d07e6b0e773d3643':
  Remove some unused window manager methods.
 2009-12-01 09:10:03 -08:00
Mike Lockwood
67045f1629 am 239775a2: am 3766ae55: Merge change I707f53cd into eclair-mr2 
Merge commit '239775a2ce01f7faf938a5edafe9941922542150'

* commit '239775a2ce01f7faf938a5edafe9941922542150':
  LightsService cleanup:
 2009-12-01 09:09:30 -08:00
Mike Lockwood
2746a1efb1 am abf7fed2: Merge change I2b7c8a32 into eclair 
Merge commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6' into eclair-plus-aosp

* commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6':
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
 2009-11-30 16:47:18 -08:00
Android (Google) Code Review
abf7fed21b Merge change I2b7c8a32 into eclair 
* changes:
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
 2009-11-30 16:39:53 -08:00
Robert Greenwalt
5154ae7665 Cleanup ConnectivityServices network configuration 
Don't instantiate objects not needed for the device.

bug: 2226064
 2009-11-30 12:56:02 -08:00
Mike Lockwood
5db4240012 Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected. 
This fixes another case where the screen would turn on when the keyguard is open but hidden by another activity.

Change-Id: I2b7c8a329036401709e96ded4f4c138041192a71
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-11-30 14:51:51 -05:00
Mike Lockwood
15740edd2a am b70da2bb: Merge change I1c281504 into eclair-mr2 
Merge commit 'b70da2bbc594b093472d5333386d79f677fd9e01' into eclair-mr2-plus-aosp

* commit 'b70da2bbc594b093472d5333386d79f677fd9e01':
  Remove some unused window manager methods.
 2009-11-30 11:00:34 -08:00
Mike Lockwood
239775a2ce am 3766ae55: Merge change I707f53cd into eclair-mr2 
Merge commit '3766ae5551e6231c251b0af38206aea30a49df63' into eclair-mr2-plus-aosp

* commit '3766ae5551e6231c251b0af38206aea30a49df63':
  LightsService cleanup:
 2009-11-30 11:00:04 -08:00
Eric Laurent
55da000c1d am bb3bb57a: Merge change I524dc046 into eclair 
Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-plus-aosp

* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
 2009-11-30 10:05:52 -08:00
Mike Lockwood
db727a8a03 Remove some unused window manager methods. 
Change-Id: I1c28150416b92b96b9f434270652c4be2613434c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-11-28 22:28:17 -05:00
Mike Lockwood
3cb67a37f1 LightsService cleanup: 
Add Light subclass to replace LightsService light setting methods
Remove LightsService.setAttentionLight() and LightsService.pulseBreathingLight()
Add support for Wifi and Bluetooth lights

Change-Id: I707f53cda27481c25649f402567a665d52e9cb62
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-11-27 15:02:11 -05:00
Eric Laurent
524dc046b1 Fix issue 2192673: Music Pausing Even when notifications are set to silent. 
Do not play ringtones, notifications or camera sounds if ringer mode is silent.
 2009-11-27 05:07:55 -08:00
Dan Egnor
4b505ef4b1 am 413eed9e: am ed8d33b7: Merge change I5ec249ab into eclair-mr2 
Merge commit '413eed9eb4fa8e3b76be46be3eb6e92675d423d4'

* commit '413eed9eb4fa8e3b76be46be3eb6e92675d423d4':
  More elimination of Formatter (I was tired of waiting several
 2009-11-25 13:54:54 -08:00
Dan Egnor
413eed9eb4 am ed8d33b7: Merge change I5ec249ab into eclair-mr2 
Merge commit 'ed8d33b7976c006b4bd28eb89cac36074e4eccf5' into eclair-mr2-plus-aosp

* commit 'ed8d33b7976c006b4bd28eb89cac36074e4eccf5':
  More elimination of Formatter (I was tired of waiting several
 2009-11-25 13:46:00 -08:00
Android (Google) Code Review
ed8d33b797 Merge change I5ec249ab into eclair-mr2 
* changes:
  More elimination of Formatter (I was tired of waiting several seconds for "dumpsys dropbox"...).
 2009-11-25 13:40:10 -08:00
Dan Egnor
5ec249abe3 More elimination of Formatter (I was tired of waiting several 
seconds for "dumpsys dropbox"...).
 2009-11-25 13:16:47 -08:00
Dan Egnor
f3ab5c6b32 am 86ef717e: am 99cee031: Merge change Ieb7a7d57 into eclair-mr2 
Merge commit '86ef717e2660dbc914dcf68295fbf9943c45bc44'

* commit '86ef717e2660dbc914dcf68295fbf9943c45bc44':
  Change the DropBoxManager API slightly (this is public, but not yet released) --
 2009-11-25 13:11:59 -08:00