227 Commits

Author SHA1 Message Date
Android (Google) Code Review
494bb21480 Merge change 5097
* changes:
  Cleanup logging and fix a startup race condition that manifested on Firestone.
2009-06-23 12:23:19 -07:00
Jason Sams
f29ca50d80 Cleanup logging and fix a startup race condition that manifested on Firestone. 2009-06-23 12:22:47 -07:00
Android (Google) Code Review
cefdd03d93 Merge change 5039
* changes:
  Fix 3 bugs in fountain test.  Correctly generate the last mip level of a non-square mip chain.  Default the background to not blended and disable dither/depth.
2009-06-22 18:20:00 -07:00
Android (Google) Code Review
b2e051a966 Merge change 5015
* changes:
  Cleanup includes so Log.h can use the tag.  rsUtils.h is the file that should be included everywhere and contain rs global defines.
2009-06-22 18:19:46 -07:00
Android (Google) Code Review
746762cba3 Merge change 4984
* changes:
  All light source objects.
2009-06-22 18:19:22 -07:00
Jason Sams
f8001669ba Fix 3 bugs in fountain test. Correctly generate the last mip level of a non-square mip chain. Default the background to not blended and disable dither/depth. 2009-06-22 18:13:36 -07:00
Jason Sams
4b962e57a9 Cleanup includes so Log.h can use the tag. rsUtils.h is the file that should be included everywhere and contain rs global defines. 2009-06-22 17:15:15 -07:00
Jason Sams
bba134c8a1 All light source objects. 2009-06-22 15:49:21 -07:00
Android (Google) Code Review
69d13f6680 am 72be4049: Merge change 4910 into donut
Merge commit '72be40490951d3f9d0ada16fcf5288d0c3306d88'

* commit '72be40490951d3f9d0ada16fcf5288d0c3306d88':
  fix warnings that will show up with GCC 4.4 (in master)
2009-06-22 14:03:17 -07:00
Android (Google) Code Review
72be404909 Merge change 4910 into donut
* changes:
  fix warnings that will show up with GCC 4.4 (in master)
2009-06-22 14:01:25 -07:00
Android (Google) Code Review
4527acb0c3 am 856dd8a6: Merge change 4952 into donut
Merge commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60'

* commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60':
  Helper API cleanup.  Allows multiple helpers to function,
2009-06-22 13:20:31 -07:00
Joe Onorato
06290a4bb9 Helper API cleanup. Allows multiple helpers to function,
because they'll always go in the same order, and this lets
us not have to write headers to keep them paired.
2009-06-22 13:02:24 -07:00
Mathias Agopian
5f91097b26 fix warnings that will show up with GCC 4.4 (in master) 2009-06-22 02:35:32 -07:00
Android (Google) Code Review
ba0b11bebe Merge change 4881
* changes:
  implement modeview matrix sliding from within scripts.
2009-06-19 18:34:17 -07:00
Jason Sams
af49c744d0 implement modeview matrix sliding from within scripts. 2009-06-19 18:33:44 -07:00
Android (Google) Code Review
fc68623c03 am 1585bd24: Merge change 4828 into donut
Merge commit '1585bd24c10d16351f89e32dddbfa799f18db6bd'

* commit '1585bd24c10d16351f89e32dddbfa799f18db6bd':
  Report densities in badging, debugging for nine patch bug.
2009-06-19 16:44:07 -07:00
Android (Google) Code Review
301e09a730 Merge change 4843
* changes:
  checkpoint filmstrip, implemented TLS.
2009-06-19 16:07:59 -07:00
Android (Google) Code Review
0697267dbc Merge change 4719
* changes:
  Fix two minor issues.  Rename launchID to launchIndex and make util class Matrix public for apps to use.
2009-06-19 16:07:37 -07:00
Jason Sams
462d11b880 checkpoint filmstrip, implemented TLS. 2009-06-19 16:03:18 -07:00
Dianne Hackborn
e17086ba34 Report densities in badging, debugging for nine patch bug.
The aapt tool now reports all available densities like it already did
for locales.  Also this includes more resource data output, which I
was using to examine bug #1867049 (which at this point I am unable to
reproduce).
2009-06-19 15:13:28 -07:00
Jason Sams
2d9c39d6e1 Fix two minor issues. Rename launchID to launchIndex and make util class Matrix public for apps to use. 2009-06-18 19:52:45 -07:00
Android (Google) Code Review
49eb3301c7 am c6282977: Merge change 4718 into donut
Merge commit 'c6282977180c220b1a68c23a328e7d75a11963ab'

* commit 'c6282977180c220b1a68c23a328e7d75a11963ab':
  Fix sim-eng build and simplify previous lcd-density related patch
2009-06-18 19:46:59 -07:00
David 'Digit' Turner
3c08a446c5 Fix sim-eng build and simplify previous lcd-density related patch 2009-06-19 04:41:12 +02:00
Android (Google) Code Review
f923ed6ff7 am 5502f04c: Merge change 4709 into donut
Merge commit '5502f04c1dcf2b1918858bacb99fb0480a711707'

* commit '5502f04c1dcf2b1918858bacb99fb0480a711707':
  backup stuff
2009-06-18 19:04:56 -07:00
Android (Google) Code Review
1c14776a13 am 16ce3504: Merge change 4708 into donut
Merge commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9'

* commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9':
  Make RestoreHelper and friends also write out the snapshot state.
2009-06-18 19:04:50 -07:00
Joe Onorato
5d605dc56b backup stuff 2009-06-18 18:41:11 -07:00
Joe Onorato
d2d9ceb730 Make RestoreHelper and friends also write out the snapshot state. 2009-06-18 18:41:11 -07:00
Android (Google) Code Review
0c7b07a003 Merge change 4692
* changes:
  Replace spins with proper pthread conditions.
2009-06-18 17:21:31 -07:00
Jason Sams
5f7fc27dce Replace spins with proper pthread conditions. 2009-06-18 16:58:42 -07:00
Android (Google) Code Review
e9c1970bbf am b1cdb648: Merge change 4565 into donut
Merge commit 'b1cdb64877ebd3b8c5182913ff02edd8b54a6982'

* commit 'b1cdb64877ebd3b8c5182913ff02edd8b54a6982':
  Allow the qemu.sf.lcd_density property to override the value of ro.sf.lcd_density
2009-06-18 15:43:28 -07:00
Android (Google) Code Review
b1cdb64877 Merge change 4565 into donut
* changes:
  Allow the qemu.sf.lcd_density property to override the value of ro.sf.lcd_density
2009-06-18 15:41:34 -07:00
David 'Digit' Turner
2a578ae518 Allow the qemu.sf.lcd_density property to override the value of ro.sf.lcd_density
ro.sf.lcd_density is usually defined in the build.prop file which is parsed by init
before anything else. Since its name begins with "ro.", this property is write-once
and cannot later be modified, e.g. in /system/etc/init.goldfish.sh.

In other words, you cannot use "emulator -prop ro.sf.lcd_density=<value>", since
it is impossible to override the value defined in build.prop

This patch modifies the system to recognize "qemu.sf.lcd_density" as an override
value, which can be set with "emulator -prop qemu.sf.lcd_density=<value>", forcing
a specific density.

A later patch will allow the emulator to automatically set this property depending
on AVD hardware configuration settings.
2009-06-19 00:17:31 +02:00
Android (Google) Code Review
6f8b5c12d3 am de72697b: Merge change 4524 into donut
Merge commit 'de72697b771d33738c5f9d6c28087504e0796622'

* commit 'de72697b771d33738c5f9d6c28087504e0796622':
  FileRestoreHelper and RestoreHelperDispatcher work.
2009-06-17 21:49:21 -07:00
Android (Google) Code Review
253e8e34b3 Merge change 4533
* changes:
  Implement default programs and implement defaults and parents for imports.
2009-06-17 16:54:35 -07:00
Jason Sams
9c54bdbf45 Implement default programs and implement defaults and parents for imports. 2009-06-17 16:52:59 -07:00
Joe Onorato
efd0fab04b FileRestoreHelper and RestoreHelperDispatcher work. 2009-06-17 16:20:55 -07:00
Joe Onorato
251c89c0a7 am 5f15d151: checkpoint BackupDatAInput / RestoreHelper
Merge commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e'

* commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e':
  checkpoint BackupDatAInput / RestoreHelper
2009-06-17 15:38:08 -07:00
Joe Onorato
5f15d151b5 checkpoint BackupDatAInput / RestoreHelper 2009-06-16 18:46:50 -07:00
Android (Google) Code Review
368d9c3ae4 Merge change 4426
* changes:
  Switch fountain to use ProgramVertex rather than hard coded camers in scripts.  Remove camera code from scripts.
2009-06-16 17:51:09 -07:00
Jason Sams
b37c0a5db6 Switch fountain to use ProgramVertex rather than hard coded camers in scripts. Remove camera code from scripts. 2009-06-16 17:49:58 -07:00
Android (Google) Code Review
d1ac159d71 Merge change 4289
* changes:
  Bug fixes.  TriangleMesh now ref-counts, implement missing element formats, add missing modes for program vertex.  Add matrix support classes.  Add test app rollo
2009-06-15 19:06:01 -07:00
Jason Sams
0826a6f90f Bug fixes. TriangleMesh now ref-counts, implement missing element formats, add missing modes for program vertex. Add matrix support classes. Add test app rollo 2009-06-15 19:04:56 -07:00
Christopher Tate
daf701fa62 am 2fdd428e: Fix some backup reader/writer issues; make local transport do backup
Merge commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2'

* commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2':
  Fix some backup reader/writer issues; make local transport do backup
  Fix the jni initializer.
  Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
  Fix bug #1812041: activity manager crash with bad args.
  Journal backup requests so that they won't be lost in a crash
  Fix data connection issues.
2009-06-14 21:13:03 -07:00
Joe Onorato
1cf587496f Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput. 2009-06-12 16:21:24 -07:00
Android (Google) Code Review
bf85d63cb8 am 78f0f8cb: Merge changes 3953,3954 into donut
Merge commit '78f0f8cb2efe9410127c39201e240f6d438eb53c'

* commit '78f0f8cb2efe9410127c39201e240f6d438eb53c':
  Make the file backup helper not crash if a file you requested
  Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
2009-06-12 08:26:05 -07:00
Joe Onorato
ce88cb15b5 Make the file backup helper not crash if a file you requested
can't be stated.  This means you don't need to know if the files
you are backing up exist or not -- we'll figure it out for you.
2009-06-11 14:51:45 -07:00
Android (Google) Code Review
31ff7a366f Merge change 3952
* changes:
  Split FountainView into View and RS parts.  Beging adding ProgramVertex to the java api.  It was already implemented in native.
2009-06-11 14:47:18 -07:00
Jason Sams
1fe9b8c3bd Split FountainView into View and RS parts. Beging adding ProgramVertex to the java api. It was already implemented in native. 2009-06-11 14:46:10 -07:00
Joe Onorato
23ecae3bbb Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
This took quite a bit of refactoring.
2009-06-11 11:29:57 -07:00
Android (Google) Code Review
43b605d682 Merge change 3850
* changes:
  Fix bug with bad conversion of java strings to C strings for object names.  Update test app to test object defines.
2009-06-10 19:09:37 -07:00