Chung-yih Wang
577afc1c15
am b65fd472: am b6264a87: Fix the build.
...
Merge commit 'b65fd4726ce625958876ee0b68c622839f33a64c'
* commit 'b65fd4726ce625958876ee0b68c622839f33a64c':
Fix the build.
2010-09-05 22:03:42 -07:00
Chung-yih Wang
b65fd4726c
am b6264a87: Fix the build.
...
Merge commit 'b6264a8795ed9469c80727123e3cafda1b07eda3' into gingerbread-plus-aosp
* commit 'b6264a8795ed9469c80727123e3cafda1b07eda3':
Fix the build.
2010-09-05 22:01:38 -07:00
Chung-yih Wang
b6264a8795
Fix the build.
...
Change-Id: Icfeec3372dcde30723c49565649be03a4dd33c06
2010-09-06 12:58:18 +08:00
Chung-yih Wang
e2aded2d54
am 2143ade8: am b12baad9: Add equals() funcation for SipPhone.
...
Merge commit '2143ade8030b8765e8744f5ff1ad90343f7fbfcd'
* commit '2143ade8030b8765e8744f5ff1ad90343f7fbfcd':
Add equals() funcation for SipPhone.
2010-09-05 21:16:16 -07:00
Chung-yih Wang
2143ade803
am b12baad9: Add equals() funcation for SipPhone.
...
Merge commit 'b12baad9357c6e6aec1f7d84fd041c54fe963407' into gingerbread-plus-aosp
* commit 'b12baad9357c6e6aec1f7d84fd041c54fe963407':
Add equals() funcation for SipPhone.
2010-09-05 21:12:57 -07:00
Chung-yih Wang
b12baad935
Add equals() funcation for SipPhone.
...
Since we will use sipuri to match the same phone object.
Change-Id: I582779e51e447bb8d822c105cf0d682651c138d2
2010-09-06 12:05:46 +08:00
Hung-ying Tyan
1b1601d740
SipService: unset session listener if listener is gone.
...
Change-Id: I0b85ee7bcb32c24cf64dfc3edc40c0cad9717562
2010-09-05 00:26:11 +08:00
Mike Lockwood
deff9c85ec
Add extra to ACTION_BATTERY_CHANGED to indicate an invalid charger is attached.
...
Change-Id: I24a24a49d2e3ddee8fbce590ef75ea323b3be97b
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-09-04 10:29:17 -04:00
Adam Cohen
839f4a54e5
-> Implemented new visualization for StackView
...
-> Cleaning up the method for creating the blue outline
-> Reimplmented onMeasure for StackView and AdapterViewAnimator
Change-Id: I59ce063661d59412de05d1a471644674f83bb7d1
2010-09-03 18:06:00 -07:00
Jim Miller
be988e3a39
Merge "Update RecentApplications to use shared Carousel widget."
2010-09-03 17:58:31 -07:00
Jim Miller
783cb60ddb
Update RecentApplications to use shared Carousel widget.
...
Change-Id: I5ca7389aeca9ee6f03f48317f9d1034f9fb8c1ca
2010-09-03 17:44:57 -07:00
Romain Guy
decf6818ea
Fix the build for real.
...
Change-Id: Ifae30acde466f22bcf4bebb198e345654c3f99ad
2010-09-03 17:32:16 -07:00
Romain Guy
26b098b57a
Merge "Fix the build."
2010-09-03 17:25:02 -07:00
Romain Guy
db3c15df15
Fix the build.
...
Change-Id: I3a8a1b3510c66c3624f1c35f71b444a391b757cb
2010-09-03 17:25:04 -07:00
Nipun Kwatra
f5e1faf1cc
Merge changes I71f5b0fc,I92c7accb
...
* changes:
Moving decision to use still camera to CameraSourceTimeLapse
pass auxiliary video parameters.
2010-09-03 17:14:51 -07:00
Kenny Root
7e955e7cce
am a060b5f7: am 6dc003a7: Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
...
Merge commit 'a060b5f73863f4b5f161674a9c5ac0a0d8d76072'
* commit 'a060b5f73863f4b5f161674a9c5ac0a0d8d76072':
Reduce footprint of Signature from ~7000 to ~1448
2010-09-03 17:10:48 -07:00
Nipun Kwatra
4a857e620f
Moving decision to use still camera to CameraSourceTimeLapse
...
CameraSourceTimeLapse now decides whether to use still or video
camera automatically. It checks if the passed in size is a valid
preview size and if it is, then uses the video camera else uses
the still camera.
Removed from StagefrightRecorder the support to set parameter
useStillCameraForTimeLapse.
Change-Id: I71f5b0fc7080ca524792381efe918d22e41a7f36
2010-09-03 17:09:36 -07:00
Kenny Root
a060b5f738
am 6dc003a7: Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
...
Merge commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032' into gingerbread-plus-aosp
* commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032':
Reduce footprint of Signature from ~7000 to ~1448
2010-09-03 17:07:15 -07:00
Kenny Root
6dc003a73f
Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
2010-09-03 16:59:42 -07:00
Romain Guy
a14c8e0c67
Bring back instances counts to dumpsys meminfo.
...
Change-Id: Idd846e137e8e87cb93551ba13751df60a8046eed
2010-09-03 16:57:53 -07:00
Jesse Wilson
0fd4c17049
am 783f14dd: am 3326f804: Fix the last remaining gaps in our Java 6 API.
...
Merge commit '783f14ddc9e4032b72aed7880aeb9d39970c98b7'
* commit '783f14ddc9e4032b72aed7880aeb9d39970c98b7':
Fix the last remaining gaps in our Java 6 API.
2010-09-03 16:55:24 -07:00
Eric Laurent
bcb284c196
am ef9e508c: am 7e427934: Merge "LVM release 1.08 delivery." into gingerbread
...
Merge commit 'ef9e508c2cb3b52d31250ceca3dddace17cec950'
* commit 'ef9e508c2cb3b52d31250ceca3dddace17cec950':
LVM release 1.08 delivery.
2010-09-03 16:52:31 -07:00
Adam Powell
bb3806e810
am 0354f0ca: (-s ours) am 7627c221: DO NOT MERGE Tweak overscroll
...
Merge commit '0354f0cad59fd87a2756d3949213fe54ac2a50f0'
* commit '0354f0cad59fd87a2756d3949213fe54ac2a50f0':
DO NOT MERGE Tweak overscroll
2010-09-03 16:52:22 -07:00
James Dong
c4e7be5be9
am d6fd133d: am 9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread
...
Merge commit 'd6fd133d18c189ab112daef9dc649d0796df5d99'
* commit 'd6fd133d18c189ab112daef9dc649d0796df5d99':
Not all audio source has the drift time information
2010-09-03 16:51:50 -07:00
Dianne Hackborn
4eb1f0d902
am acc4e041: (-s ours) am 69717ccd: DO NOT MERGE. Some stuff that is Not Ready.
...
Merge commit 'acc4e041d27c24b45fb190c493717fda987b52c2'
* commit 'acc4e041d27c24b45fb190c493717fda987b52c2':
DO NOT MERGE. Some stuff that is Not Ready.
2010-09-03 16:51:32 -07:00
Romain Guy
bfcb1f5c4e
Merge "Prevent the system process from using the HardwareRenderer."
2010-09-03 16:49:36 -07:00
Jesse Wilson
783f14ddc9
am 3326f804: Fix the last remaining gaps in our Java 6 API.
...
Merge commit '3326f8043858152ea2a407a9a4c20fdcdc859e73' into gingerbread-plus-aosp
* commit '3326f8043858152ea2a407a9a4c20fdcdc859e73':
Fix the last remaining gaps in our Java 6 API.
2010-09-03 16:42:51 -07:00
Dianne Hackborn
6171401a0a
resolved conflicts for merge of 6a3ffb5b to master
...
Change-Id: I3c77887f56c4fdc1cd80682eccc2f5e0020e2761
2010-09-03 16:40:58 -07:00
Eric Laurent
ef9e508c2c
am 7e427934: Merge "LVM release 1.08 delivery." into gingerbread
...
Merge commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b' into gingerbread-plus-aosp
* commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b':
LVM release 1.08 delivery.
2010-09-03 16:39:59 -07:00
Jesse Wilson
3326f80438
Fix the last remaining gaps in our Java 6 API.
...
See http://b/issue?id=2497395
See https://android-git.corp.google.com/g/64647
Change-Id: I0886e06163a3853bff69480b01e6e9f9f54fea4e
2010-09-03 16:37:27 -07:00
Eric Laurent
7e427934e6
Merge "LVM release 1.08 delivery." into gingerbread
2010-09-03 16:35:54 -07:00
Adam Powell
0354f0cad5
am 7627c221: DO NOT MERGE Tweak overscroll
...
Merge commit '7627c221c6ce8bf433bf207b002eabe7236c4757' into gingerbread-plus-aosp
* commit '7627c221c6ce8bf433bf207b002eabe7236c4757':
DO NOT MERGE Tweak overscroll
2010-09-03 16:33:37 -07:00
Chet Haase
13cc1207fa
Add ability to enable layout transition animations by default from XML
...
Change-Id: I2b884c83e868f5d22ef85d65ff8ee984633de65e
2010-09-03 16:22:22 -07:00
Robert Greenwalt
70af574b3d
Some cleanup of Proxy class.
...
Switch to using InetSocketAddress.
Change-Id: Ibdb97fcd2d06eecaa1e847b78267180156089f27
2010-09-03 16:18:41 -07:00
Adam Powell
7627c221c6
DO NOT MERGE Tweak overscroll
...
Change-Id: I5ba00fc87ba7b286978acf577ba6461f79066437
2010-09-03 16:09:03 -07:00
Romain Guy
5233920a21
Prevent the system process from using the HardwareRenderer.
...
This change allows applications with the system UID to use the hardware
renderer.
Change-Id: I3c5d776ee9c07bb14933dbe3060cad4175e4fc95
2010-09-03 16:04:46 -07:00
Kenny Root
de0ff63700
Reduce footprint of Signature from ~7000 to ~1448
...
Signature had lazy initialization of the mString member when needed, but
it would stick around forever when initialized. Each package had one or
more Signatures that would be ~7000 bytes each. At a couple hundred
packages, that's over 1.3MB just for signatures.
Whenever packages.xml was written out, it would write the Signature for
each program as well which happens at boot thereby initializing the
mString member pretty much immediately.
Change-Id: Idb882ffeca2861b3e87437fc83f001710d6c0441
2010-09-03 16:02:27 -07:00
James Dong
d6fd133d18
am 9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread
...
Merge commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62' into gingerbread-plus-aosp
* commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62':
Not all audio source has the drift time information
2010-09-03 15:45:01 -07:00
James Dong
9077f8ec93
Merge "Not all audio source has the drift time information" into gingerbread
2010-09-03 15:42:09 -07:00
Joe Malin
2cb3e29e82
Merge "Doc Change:ActivityManager usage doc:running test package"
2010-09-03 15:30:24 -07:00
Joe Malin
b6e19a23eb
Merge "Doc change: Update pm command usage for test packages"
2010-09-03 15:29:59 -07:00
Dianne Hackborn
acc4e041d2
am 69717ccd: DO NOT MERGE. Some stuff that is Not Ready.
...
Merge commit '69717ccd13bb5568b912701ab39d603cfa7091cc' into gingerbread-plus-aosp
* commit '69717ccd13bb5568b912701ab39d603cfa7091cc':
DO NOT MERGE. Some stuff that is Not Ready.
2010-09-03 15:23:46 -07:00
Eric Laurent
5fa6df6ebf
LVM release 1.08 delivery.
...
- Changed bundle SamplesToExit to 0.1 secs
- Added SamplesToExit to Revreb
- Removed mixer from Core reverb
Change-Id: I675ec22889f20ef35a0ac427600c2654111c397e
2010-09-03 15:22:18 -07:00
Gloria Wang
ed4fbd98d0
Merge "Fix for the incorrect size of the new added DRM file. (bug 2897238)"
2010-09-03 15:21:50 -07:00
Dianne Hackborn
69717ccd13
DO NOT MERGE. Some stuff that is Not Ready.
...
Change-Id: I8fdba32722d86b92c791dbf7c6c0166bcdb02852
2010-09-03 15:20:06 -07:00
Dianne Hackborn
6a3ffb5bee
am df3a0f50: Merge "Improve doc." into gingerbread
...
Merge commit 'df3a0f50c3480911e366c8c0781b0463fe063e82' into gingerbread-plus-aosp
* commit 'df3a0f50c3480911e366c8c0781b0463fe063e82':
Improve doc.
2010-09-03 15:18:39 -07:00
Dianne Hackborn
df3a0f50c3
Merge "Improve doc." into gingerbread
2010-09-03 15:15:50 -07:00
Dianne Hackborn
6c82f673f6
am fd3f44b3: am e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread
...
Merge commit 'fd3f44b38882c74c10aff0e238ee4ad9fcd8b724'
* commit 'fd3f44b38882c74c10aff0e238ee4ad9fcd8b724':
Adding a feature denoting support for 5 or more fully
2010-09-03 15:14:57 -07:00
Dianne Hackborn
170bae7d83
Improve doc.
...
Change-Id: I841b04e1e455b6236fb8b65b965f2fc25c4461f0
2010-09-03 15:14:28 -07:00
Dianne Hackborn
fd3f44b388
am e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread
...
Merge commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8' into gingerbread-plus-aosp
* commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8':
Adding a feature denoting support for 5 or more fully
2010-09-03 15:10:24 -07:00