Commit Graph

19870 Commits

Author SHA1 Message Date
Wu-cheng Li
1c7be28971 am 17ae3597: Revert "android.hardware.Camera.open only returns back-facing camera."
* commit '17ae359721ba74399e785369346509b776999d1f':
  Revert "android.hardware.Camera.open only returns back-facing camera."
2010-11-08 12:19:26 -08:00
Wu-cheng Li
d2cb6c2d71 am 07b88fef: android.hardware.Camera.open only returns back-facing camera.
* commit '07b88fefd4e6386ad3265da47d008b40e6a58891':
  android.hardware.Camera.open only returns back-facing camera.
2010-11-08 12:19:15 -08:00
Andreas Huber
0b12d14602 resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp
Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
2010-11-08 11:56:08 -08:00
David 'Digit' Turner
dfd0759ff6 Refresh EGL header to work with the NDK
This change allows to use this header with the NDK's standalone toolchain.
For the record, the NDK toolchain defines __ANDROID__ as a compiler built-in
macro, this is however not the case currently for the prebuilt binaries that
are being used by the full Android build system, which otherwise defines ANDROID.

This change allows the header to be used by all toolchains properly. Note however
that we should properly should change our toolchain and sources to provide and
rely on __ANDROID__ instead of ANDROID though.

Change-Id: Iaa1aa1146985b5f24dcf3a83d9ddb9b4b59dc328
2010-11-07 23:36:28 +01:00
James Dong
2bc35eb78e am 1653e261: Merge "Rotation support" into gingerbread
* commit '1653e261e84922facfe27d3d8acc455ed2b6b6da':
  Rotation support
2010-11-06 14:22:05 -07:00
James Dong
d400c5edb4 am 0467b0ab: Merge "Add a new public API to support recording rotated videos" into gingerbread
* commit '0467b0abfc94f959163d84eadedf6941e41c1882':
  Add a new public API to support recording rotated videos
2010-11-06 14:21:53 -07:00
Scott Main
877c0ac214 am ab3d69f6: Merge "docs: update homepage for GB" into gingerbread
* commit 'ab3d69f6d5a9157438f86cf90449a5f5ce7e31e0':
  docs: update homepage for GB
2010-11-06 14:21:23 -07:00
James Dong
dca7b6fbd0 Merge "Rotation support" into gingerbread 2010-11-05 16:58:51 -07:00
James Dong
29bdd6749b Merge "Add a new public API to support recording rotated videos" into gingerbread 2010-11-05 16:58:33 -07:00
Scott Main
56cf5dfa73 Merge "docs: update homepage for GB" into gingerbread 2010-11-05 15:02:39 -07:00
Jean-Baptiste Queru
2148da1c5d am 5580e44c: Merge "Support changing style parent in overlays"
* commit '5580e44c250944f5cd011b2682eea5cc2de9706c':
  Support changing style parent in overlays
2010-11-05 14:05:41 -07:00
Kenny Root
816ae9e6d1 am 70fc04c8: Reorganize PackageManager dump to avoid NPE
* commit '70fc04c84db8f99ac2ac60fd9719b91057aacc9b':
  Reorganize PackageManager dump to avoid NPE
2010-11-05 13:58:20 -07:00
Robert Ly
0d09a904f0 am 47e43feb: Doc change: Proguard tool
* commit '47e43febdd8ba83c333c9c98ca6a8c0bda421305':
  Doc change: Proguard tool
2010-11-05 13:58:12 -07:00
Hiroshi Lockheimer
ac82c74b9e am ce22d608: Merge "allow all 4 orientations" into gingerbread
* commit 'ce22d608733953e367a590efd9c7656a68ffc24d':
  allow all 4 orientations
2010-11-05 13:58:04 -07:00
Scott Main
ca95e47464 am 4ebbfa8a: Merge "Doc change: Updating and restructuring the NDK section for GB. Filenames for new NDK packages still need updating." into gingerbread
* commit '4ebbfa8a44da790eb13e7e88314bd0a648f8b891':
  Doc change: Updating and restructuring the NDK section for GB. Filenames for new NDK packages still need updating.
2010-11-05 13:57:52 -07:00
Scott Main
cde7d40ce0 am 46151652: Merge "fix xlarge support in aapt for gingerbread" into gingerbread
* commit '46151652b8dc562f4a3332e1d12fa799e3638ea8':
  fix xlarge support in aapt for gingerbread
2010-11-05 13:57:41 -07:00
Scott Main
6601c3a8ce am 6e88c84c: docs: remove allowClearUserData from <application> manifest doc and clarify in javadocs that it\'s only for system apps bug: 3128020
* commit '6e88c84cbe0a07cb8c7b9ea23d1434bcf2e2a457':
  docs: remove allowClearUserData from <application> manifest doc and clarify in javadocs that it's only for system apps bug: 3128020
2010-11-05 13:57:31 -07:00
Jean-Baptiste Queru
22285363d9 Merge db2403ff from open-source master
Change-Id: I90dfa2f37db901b62690b6becbf5d0d91468672c
2010-11-05 07:53:24 -07:00
Hiroshi Lockheimer
b307b2386b Merge "allow all 4 orientations" into gingerbread 2010-11-05 05:21:00 +00:00
Scott Main
b9539d6dd0 Merge "Doc change: Updating and restructuring the NDK section for GB. Filenames for new NDK packages still need updating." into gingerbread 2010-11-04 19:27:50 -07:00
Scott Main
c08b653546 Merge "fix xlarge support in aapt for gingerbread" into gingerbread 2010-11-04 18:56:47 -07:00
Dan Bornstein
7ac1ff2e16 am 265acc50: am 05cc2d63: (-s ours) This class no longer exists.
* commit '265acc5085ad03c4c043dd33faed808b55732134':
  This class no longer exists.
2010-11-04 17:12:16 -07:00
Dan Bornstein
26fbc727b2 am 7dbeb24a: This class no longer exists.
* commit '7dbeb24a9fa950ec99fbcd8cbfcfdd8199de3d86':
  This class no longer exists.
2010-11-04 17:12:10 -07:00
Dan Bornstein
a8aaf181b1 am 05cc2d63: (-s ours) This class no longer exists.
* commit '05cc2d635eba165098a8ff58678a2ef1db5ddd1a':
  This class no longer exists.
2010-11-04 16:30:06 -07:00
Eric Rowe
54a77bd269 am 82fc12af: Merge "DO NOT MERGE Add acceptPair method to BT stress." into gingerbread
* commit '82fc12af416e351cb0a9d978734d585ab66d3f27':
  DO NOT MERGE Add acceptPair method to BT stress.
2010-11-04 15:37:19 -07:00
Eric Rowe
860417a853 Merge "DO NOT MERGE Add acceptPair method to BT stress." into gingerbread 2010-11-04 14:54:23 -07:00
Scott Main
d8f7aa68d9 am 17c87d80: Merge "docs: more revisions to the installing docs for GB" into gingerbread
* commit '17c87d80c65d047c2db353d9826fef3e0d4d3535':
  docs: more revisions to the installing docs for GB
2010-11-04 09:20:40 -07:00
Scott Main
07581f4ffd Merge "docs: more revisions to the installing docs for GB" into gingerbread 2010-11-04 09:17:54 -07:00
Jean-Baptiste Queru
dd1cbdb9f9 Merge "Support changing style parent in overlays" 2010-11-04 07:26:37 -07:00
Jean-Baptiste Queru
ea4f07f93a Merge 42c94791 from open-source master
Change-Id: Id17a1a787b6d46c44ba39d628129a3a27f6d70be
2010-11-04 07:22:44 -07:00
James Dong
ecf5563442 am c0fa1d47: Merge "Revert "Support rotation in media recorder"" into gingerbread
* commit 'c0fa1d4791667ee8d1a9685749e42426fe8bd38b':
  Revert "Support rotation in media recorder"
2010-11-03 19:44:45 -07:00
James Dong
fde60b39f9 Merge "Revert "Support rotation in media recorder"" into gingerbread 2010-11-03 19:42:17 -07:00
Scott Main
3be11ef1ff am 42361551: Merge "docs: some more edits to the sdk install docs" into gingerbread
* commit '42361551b1e97884735b44dd49147ac133fa146e':
  docs: some more edits to the sdk install docs
2010-11-03 18:04:56 -07:00
Scott Main
07a722fd22 Merge "docs: some more edits to the sdk install docs" into gingerbread 2010-11-03 18:03:01 -07:00
Mathias Agopian
55cdadc0a2 am 477c4fee: Merge "[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread
* commit '477c4feee2f0922dbc8952639cc12987d5cdce04':
  [3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R.
2010-11-03 17:59:47 -07:00
Hiroshi Lockheimer
284f432b75 am c181a082: Merge "Support rotation in media recorder" into gingerbread
* commit 'c181a08209dc85c80e4da5d20cd3980998def40d':
  Support rotation in media recorder
2010-11-03 17:59:43 -07:00
Mathias Agopian
61ee1a86df Merge "[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread 2010-11-03 17:57:32 -07:00
Hiroshi Lockheimer
2c08def60c Merge "Support rotation in media recorder" into gingerbread 2010-11-03 17:57:28 -07:00
Gilles Debunne
17cf27a872 am 698dd812: Merge "ldpi assets created from hdpi in core." into gingerbread
* commit '698dd8127636fcf57c56dcc90688fb5e8afb8abb':
  ldpi assets created from hdpi in core.
2010-11-03 17:38:50 -07:00
Gilles Debunne
7b9085d53b Merge "ldpi assets created from hdpi in core." into gingerbread 2010-11-03 17:37:28 -07:00
Hiroshi Lockheimer
57548f0cb3 am e0887cc7: Merge "Squash ANRs in UsbStorageActivity." into gingerbread
* commit 'e0887cc7febe2a03f1685e4aa3cb131c455d8cd0':
  Squash ANRs in UsbStorageActivity.
2010-11-03 17:10:33 -07:00
Hiroshi Lockheimer
e51cdee3eb Merge "Squash ANRs in UsbStorageActivity." into gingerbread 2010-11-03 17:08:03 -07:00
Alexander Lucas
2b7865c81d am 6f4a084e: Merge "Added SIP Demo" into gingerbread
* commit '6f4a084e33c917b7e04309a4296404aef7325fca':
  Added SIP Demo
2010-11-03 15:35:29 -07:00
Alexander Lucas
211a28eaae Merge "Added SIP Demo" into gingerbread 2010-11-03 15:32:57 -07:00
Scott Main
4cb81c01b2 am 08810efc: docs: provide overview of the web apps docs and revise images in the targeting doc
* commit '08810efc1a1868261fb042355f75ab049438b6e3':
  docs: provide overview of the web apps docs and revise images in the targeting doc
2010-11-03 15:18:10 -07:00
Justin Ho
82d5353f73 am 112b5b1f: Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread
* commit '112b5b1f304846a1f6999a8347f45dae43719b8f':
  DO NOT MERGE - Updated VPNServices stat_sys icons
2010-11-03 13:43:09 -07:00
Justin Ho
87933f223c Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread 2010-11-03 13:39:26 -07:00
Jeff Hamilton
ab29443cd4 am ef569469: Merge "Remove the My Tag feature." into gingerbread
* commit 'ef5694692f88bb91ed6ee1191b11a66ec594ff39':
  Remove the My Tag feature.
2010-11-03 13:37:22 -07:00
Jeff Hamilton
8de195a531 Merge "Remove the My Tag feature." into gingerbread 2010-11-03 13:34:39 -07:00
Rodrigo Obregon
71484f2f76 Framebuffer: Support variable number of framebuffers in the UI
This change defines a macro NUM_FRAME_BUFFERS to set
the desired number of framebuffers to be used by the UI,
instead of hard-coding 2 framebuffers.

Aditional logic has been  added to handle the initialization
and destruction of NUM_FRAME_BUFFERS buffers.

Change-Id: I3a4bfec3e0f453432f2ffebf084c00f574d3be46
Signed-off-by: Rodrigo Obregon <robregon@ti.com>
2010-11-03 15:16:18 -05:00