Commit Graph

19842 Commits

Author SHA1 Message Date
Wu-cheng Li
ec8f8774e3 am f6bd761f: Use back-facing camera as default in camera/camcorder profile.do not merge
* commit 'f6bd761f9407a35cc1c4a4b9e199e6a0dc8e4943':
  Use back-facing camera as default in camera/camcorder profile.do not merge
2010-11-08 23:56:20 -08:00
James Dong
ad49af20e2 am 1b2efbca: Merge "Update a comment about when setOrientationHint() should be called" into gingerbread
* commit '1b2efbca7120cf799d1242d277af354df7b0a9bb':
  Update a comment about when setOrientationHint() should be called
2010-11-08 20:14:19 -08:00
James Dong
b9e1c44fa9 Merge "Update a comment about when setOrientationHint() should be called" into gingerbread 2010-11-08 19:59:16 -08:00
Adam Powell
6dd94880ef Merge "Fix typo in manual merge" into gingerbread-plus-aosp 2010-11-08 19:59:13 -08:00
Mathias Agopian
708433df69 am cd43fbb4: Merge "improve sensorservice dumpsys and increase the max sensor rate to 1 ms (1000Hz)" into gingerbread
* commit 'cd43fbb4537487a9c3185e919904f8b0c93daee6':
  improve sensorservice dumpsys and increase the max sensor rate to 1 ms (1000Hz)
2010-11-08 19:38:28 -08:00
Adam Powell
7ef1b219d8 resolved conflicts for merge of 06fd1dc5 to gingerbread-plus-aosp
Change-Id: Iae11cabdc3c6b6b59dfdcc3b4944088dded91a52
2010-11-08 19:21:58 -08:00
Adam Powell
96fc1ced8a am 26153a33: Fix bug 3163052 - always use 32-bit drawing caches when destination window is 32-bit
* commit '26153a33df8e6608bd37da7d44214b2a0db3195f':
  Fix bug 3163052 - always use 32-bit drawing caches when destination window is 32-bit
2010-11-08 18:35:22 -08:00
Mathias Agopian
820a5aa233 Merge "improve sensorservice dumpsys and increase the max sensor rate to 1 ms (1000Hz)" into gingerbread 2010-11-08 18:28:32 -08:00
James Dong
49f2ff9e07 am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" into gingerbread
* commit 'd2d62d04fc387e2f51d414e101a3e8e3c45f415e':
  Support extracting thumbnail from rotated video tracks
2010-11-08 18:19:40 -08:00
Andy McFadden
275daed341 am 08686b07: am c10a4773: Set capabilities sooner.
* commit '08686b0755a841d343249ac951db4ec2d7770cba':
  Set capabilities sooner.
2010-11-08 18:19:34 -08:00
Adam Powell
6a93f33840 Merge "DO NOT MERGE Fix bug 3121030 - Text handles erroneously appear over extract mode IME window" into gingerbread 2010-11-08 18:14:01 -08:00
Justin Ho
c4c7794bf8 am dee7335b: Merge "DO NOT MERGE - Updated textfield pressed states" into gingerbread
* commit 'dee7335b8f9b691688da2139da42aa2c2434b862':
  DO NOT MERGE - Updated textfield pressed states
2010-11-08 18:02:22 -08:00
James Dong
cf87ec3e6e Merge "Support extracting thumbnail from rotated video tracks" into gingerbread 2010-11-08 18:00:14 -08:00
Andy McFadden
41c29357ad am c10a4773: Set capabilities sooner.
* commit 'c10a4773ece6ca66ba9cfe4cd15e5987a02bee68':
  Set capabilities sooner.
2010-11-08 17:58:50 -08:00
Justin Ho
4fa59225c5 Merge "DO NOT MERGE - Updated textfield pressed states" into gingerbread 2010-11-08 17:49:57 -08:00
Scott Main
b4f8301408 am 05de5a15: Merge "docs: remove quick start; make it an overview of the steps and go to installing guide" into gingerbread
* commit '05de5a15a3b36046df98a7da7a210b7ffc4d43e2':
  docs: remove quick start; make it an overview of the steps and go to installing guide
2010-11-08 16:08:48 -08:00
Scott Main
c344054897 Merge "docs: remove quick start; make it an overview of the steps and go to installing guide" into gingerbread 2010-11-08 16:05:24 -08:00
Mathias Agopian
f101430549 am 5fd30540: Merge "possibly fix [2265804] OpenGL GLSurfaceView apps don\'t draw status bar drop shadow correctly" into gingerbread
* commit '5fd3054048b41b033700be3f30e4bca69f4f13a6':
  possibly fix [2265804] OpenGL GLSurfaceView apps don't draw status bar drop shadow correctly
2010-11-08 13:48:08 -08:00
Mathias Agopian
ac03a0c56f am fe40e9e0: Merge "fix [3148312] Region can access data out of bounds" into gingerbread
* commit 'fe40e9e0ce7b5536be9f9ff0596714a0eb921b1e':
  fix [3148312] Region can access data out of bounds
2010-11-08 13:44:00 -08:00
Mathias Agopian
dcdcc115d2 Merge "possibly fix [2265804] OpenGL GLSurfaceView apps don't draw status bar drop shadow correctly" into gingerbread 2010-11-08 13:41:31 -08:00
Mathias Agopian
a2b1b7f71d Merge "fix [3148312] Region can access data out of bounds" into gingerbread 2010-11-08 13:40:40 -08:00
Wu-cheng Li
9969af2457 am a48b70fa: Camera.open() should only return back-facing camera.
* commit 'a48b70fa8ff6363d1e5282be70f6be12bc0688dc':
  Camera.open() should only return back-facing camera.
2010-11-08 12:19:35 -08:00
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