Alex Sakhartchouk
db6f11bd30
Fixing a3d files to reflect the new element structure.
...
Change-Id: I44d95c9411706813dde815c5f052f3615e8b483e
2010-09-07 12:10:18 -07:00
Jason Sams
70d4e50242
Add arrays to elements.
...
Change-Id: I624b03bfc1fd26136afd9305a96026b91b1fad3c
2010-09-07 12:06:05 -07:00
Alex Sakhartchouk
355383e424
Merge "Fixing fragment shader bounding code"
2010-09-03 12:58:28 -07:00
Daniel Sandler
78e42751f3
Merge "Don't get stung!"
2010-09-03 12:51:36 -07:00
Chet Haase
52d33aa412
Merge "Add transition effects for layout changes on ViewGroups"
2010-09-03 12:31:17 -07:00
Chet Haase
21cd1389d2
Add transition effects for layout changes on ViewGroups
...
Change-Id: Ibefcca5692450188fbcec608f3f7e36be1213b21
2010-09-03 12:20:00 -07:00
Marco Nelissen
462bac9222
am e7884d68: am d85621c9: Don\'t crash when extra logging is enabled.
...
Merge commit 'e7884d68a613e579a12a52455f6b5b13a90a0f8a'
* commit 'e7884d68a613e579a12a52455f6b5b13a90a0f8a':
Don't crash when extra logging is enabled.
2010-09-03 11:54:31 -07:00
Marco Nelissen
e7884d68a6
am d85621c9: Don\'t crash when extra logging is enabled.
...
Merge commit 'd85621c938286a568b1173e7ab29f80ab93d27e1' into gingerbread-plus-aosp
* commit 'd85621c938286a568b1173e7ab29f80ab93d27e1':
Don't crash when extra logging is enabled.
2010-09-03 11:51:28 -07:00
Marco Nelissen
d85621c938
Don't crash when extra logging is enabled.
...
Change-Id: I76cf8db0f51ed33e91acee9636180e8d7c0b5ff9
2010-09-03 11:46:19 -07:00
Daniel Sandler
44434f002a
Don't get stung!
...
Change-Id: I8211675e619bcc31c991296387513d07ad53ff10
2010-09-03 14:45:45 -04:00
Daniel Sandler
b062f02d54
Merge "Fix status bar battery meter."
2010-09-03 11:41:43 -07:00
James Dong
9b3569bc42
am bc1452a3: am 7755cdd6: Remove unused/debugging code from MP4 file writer
...
Merge commit 'bc1452a307ac61ca87bf78722701ac85100952af'
* commit 'bc1452a307ac61ca87bf78722701ac85100952af':
Remove unused/debugging code from MP4 file writer
2010-09-03 11:37:14 -07:00
James Dong
bc1452a307
am 7755cdd6: Remove unused/debugging code from MP4 file writer
...
Merge commit '7755cdd69690ccbb42c6fd47b3e9c4594d4ade82' into gingerbread-plus-aosp
* commit '7755cdd69690ccbb42c6fd47b3e9c4594d4ade82':
Remove unused/debugging code from MP4 file writer
2010-09-03 11:33:47 -07:00
Daniel Sandler
3df3ad3faa
Fix status bar battery meter.
...
Bug: 2974927
Change-Id: I22bcf92a85bca3c2c2d1d2efd2a501e563b3c84c
2010-09-03 14:28:02 -04:00
Daniel Sandler
2af574d815
Merge "Tweaks to lights out animation."
2010-09-03 10:13:55 -07:00
James Dong
7755cdd696
Remove unused/debugging code from MP4 file writer
...
o also makes nal length in the recorded file modifiable at runtime
Change-Id: I731b4dde7070d8d9628b36b523a5b2c011c7c2cf
2010-09-03 10:13:19 -07:00
James Dong
0e60f5304b
am 3c3fc97e: am 46e63b34: Merge "Better file size estimate" into gingerbread
...
Merge commit '3c3fc97e104bd17af608727d82e965fc28f2c89d'
* commit '3c3fc97e104bd17af608727d82e965fc28f2c89d':
Better file size estimate
2010-09-03 09:59:05 -07:00
Kenny Root
4d42bdec82
am 0eec8948: am 305bcbf0: Decrease PackageManagerService wait time for vold
...
Merge commit '0eec8948f89c5216464d8204cadd69d7a6ec3669'
* commit '0eec8948f89c5216464d8204cadd69d7a6ec3669':
Decrease PackageManagerService wait time for vold
2010-09-03 09:58:51 -07:00
James Dong
3c3fc97e10
am 46e63b34: Merge "Better file size estimate" into gingerbread
...
Merge commit '46e63b346770efa14451b8e67b7f7636c4e5a76c' into gingerbread-plus-aosp
* commit '46e63b346770efa14451b8e67b7f7636c4e5a76c':
Better file size estimate
2010-09-03 09:55:38 -07:00
Kenny Root
0eec8948f8
am 305bcbf0: Decrease PackageManagerService wait time for vold
...
Merge commit '305bcbf0c961840c4505770d084a1caacc074dbb' into gingerbread-plus-aosp
* commit '305bcbf0c961840c4505770d084a1caacc074dbb':
Decrease PackageManagerService wait time for vold
2010-09-03 09:55:33 -07:00
James Dong
46e63b3467
Merge "Better file size estimate" into gingerbread
2010-09-03 09:53:13 -07:00
Maksymilian Osowski
94cba5b2a2
Merge "Fixed the run_apache2.py script to use the correct mime.types file."
2010-09-03 09:49:51 -07:00
Kenny Root
305bcbf0c9
Decrease PackageManagerService wait time for vold
...
Up the blocking queue maximum to twice the number of containers we
allow which should let "asec list" complete without blocking the thread
several times.
Change the threads for the NativeDaemonConnector to vold and netd to be
more descriptive instead of the same name.
Bug: 2501075
Change-Id: I7e7949845a6c70a3d619aec0fa79ceef3c17a4be
2010-09-03 09:33:34 -07:00
Maksymilian Osowski
5846d4561d
Fixed the run_apache2.py script to use the correct mime.types file.
...
Change-Id: I0bd5870259b3f7de92d4996d1ebb83fdff126210
2010-09-03 17:03:33 +01:00
Leon Scroggins III
e742c08ce0
Use the proper selection when performing a delete.
...
Bug: 2956964
Change-Id: I488c291b2fb3cfa5c5d510bd4a03afbc8949d8d8
2010-09-03 11:45:28 -04:00
Wink Saville
de7fb55369
Merge "Fix and simplify ConnectivityService singleton."
2010-09-03 08:16:30 -07:00
Bjorn Bringert
c4b0598239
Merge "Test for decoding Bitmap from MemoryFile ParcelFileDescriptor"
2010-09-03 02:27:05 -07:00
Kenny Root
1d5c87b753
am fb79b7da: am 12da9d74: Fix buffer compacting in NativeDaemonConnector
...
Merge commit 'fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f'
* commit 'fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f':
Fix buffer compacting in NativeDaemonConnector
2010-09-02 22:32:39 -07:00
Kenny Root
fb79b7dab3
am 12da9d74: Fix buffer compacting in NativeDaemonConnector
...
Merge commit '12da9d7472ae87b841575d5358e19f143d12f900' into gingerbread-plus-aosp
* commit '12da9d7472ae87b841575d5358e19f143d12f900':
Fix buffer compacting in NativeDaemonConnector
2010-09-02 22:29:05 -07:00
Kenny Root
12da9d7472
Fix buffer compacting in NativeDaemonConnector
...
The buffer was being compacted in the read loop, but the start offset on
the compacted buffer wasn't being considered after the next read.
Bug: 2501075
Change-Id: I163297d751cf800d0bbc66df66b1a0fa0785de49
2010-09-02 22:24:06 -07:00
James Dong
cb7e65c6cb
Better file size estimate
...
When the recorded file becomes large, the metadata size can
no longer be ignored. This makes it possible to save the
recorded file when the storage becomes almost full at the
end of the recording session.
Change-Id: Ief038080f825c9946ce550949c03e914aec1e31a
2010-09-02 20:10:00 -07:00
Hung-ying Tyan
3559d1d1fc
am ea16e72b: am b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread
...
Merge commit 'ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d'
* commit 'ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d':
SipManager: always return true for SIP API and VOIP support query.
2010-09-02 19:30:16 -07:00
Hung-ying Tyan
ea16e72bff
am b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread
...
Merge commit 'b355714a2995ebe343808e06f69da5067f52a833' into gingerbread-plus-aosp
* commit 'b355714a2995ebe343808e06f69da5067f52a833':
SipManager: always return true for SIP API and VOIP support query.
2010-09-02 19:26:56 -07:00
Wink Saville
bb08caf54b
Fix and simplify ConnectivityService singleton.
...
Change-Id: Idb74854db9d801c1cc138eb5ca866cf01940ff6d
2010-09-02 19:23:52 -07:00
Hung-ying Tyan
b355714a29
Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread
2010-09-02 19:23:31 -07:00
Hung-ying Tyan
643fce9781
SipManager: always return true for SIP API and VOIP support query.
...
Change-Id: I397a804e0aa598aee77a8ce28ada1b11e10fbaea
http://b/issue?id=2972054
2010-09-03 10:19:23 +08:00
Scott Main
b433298530
am beccf3c4: am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo
...
Merge commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c'
* commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c':
clarify dp dimension description
2010-09-02 18:53:32 -07:00
James Dong
9f20d3328f
am bb64e554: am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread
...
Merge commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3'
* commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3':
Calculate audio media drift time from AudioSource
2010-09-02 18:51:05 -07:00
Scott Main
beccf3c48a
am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo
...
Merge commit '3208557edca8c133fa32b7718acd22d77f1a9475' into gingerbread-plus-aosp
* commit '3208557edca8c133fa32b7718acd22d77f1a9475':
clarify dp dimension description
2010-09-02 18:44:11 -07:00
Alex Sakhartchouk
caaac0f827
Fixing fragment shader bounding code
...
Change-Id: I743dae12bb3f226f758a065d9b353eff36e2f964
2010-09-02 18:43:24 -07:00
James Dong
bb64e554d9
am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread
...
Merge commit '7ed7668b30e70ca8e3f0f183364433326ed29f39' into gingerbread-plus-aosp
* commit '7ed7668b30e70ca8e3f0f183364433326ed29f39':
Calculate audio media drift time from AudioSource
2010-09-02 18:41:49 -07:00
Scott Main
3208557edc
am c5083cdf: Merge "clarify dp dimension description" into froyo
...
Merge commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879' into gingerbread
* commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879':
clarify dp dimension description
2010-09-02 18:30:16 -07:00
James Dong
7ed7668b30
Merge "Calculate audio media drift time from AudioSource" into gingerbread
2010-09-02 18:24:21 -07:00
Adam Powell
f52faefce8
Merge "Make spinnerMode attribute for Spinner widgets public"
2010-09-02 18:12:07 -07:00
Adam Powell
d477176d3f
Make spinnerMode attribute for Spinner widgets public
...
Change-Id: Ib448f8511cc7ff92ad8120a891ccaa8cdde6c9dc
2010-09-02 18:07:49 -07:00
Dianne Hackborn
f156e752b5
am 31103928: am 192b56d4: Merge "Implement #2964234 : Add support for <uses-package> element to aapt" into gingerbread
...
Merge commit '31103928ed5b9091bcd7de74c8a49675d10c87e7'
* commit '31103928ed5b9091bcd7de74c8a49675d10c87e7':
Implement #2964234 : Add support for <uses-package> element to aapt
2010-09-02 17:59:51 -07:00
Scott Main
c5083cdfff
Merge "clarify dp dimension description" into froyo
2010-09-02 17:53:14 -07:00
Dianne Hackborn
31103928ed
am 192b56d4: Merge "Implement #2964234 : Add support for <uses-package> element to aapt" into gingerbread
...
Merge commit '192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d' into gingerbread-plus-aosp
* commit '192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d':
Implement #2964234 : Add support for <uses-package> element to aapt
2010-09-02 17:36:37 -07:00
Dianne Hackborn
192b56d42a
Merge "Implement #2964234 : Add support for <uses-package> element to aapt" into gingerbread
2010-09-02 17:34:31 -07:00
Adam Powell
0a01f076d2
Merge "Fix bug 2963261"
2010-09-02 17:19:44 -07:00