Commit Graph

24375 Commits

Author SHA1 Message Date
Scott Main
24a6729a25 Merge "docs: add release notes for ADT v8" into gingerbread 2010-11-09 15:29:22 -08:00
Amith Yamasani
5261199c6e Merge "Fix preference layouts so that custom preferences don't break." 2010-11-09 15:11:29 -08:00
Andreas Huber
792f3a75c9 Merge "Some refactoring and added support for another form of vbr headers." 2010-11-09 14:59:13 -08:00
Brad Fitzpatrick
7ca663369c Merge "Don't warn on reading from disk during initial class loading." 2010-11-09 14:52:15 -08:00
Mathias Agopian
744026fed6 DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions
We just make sure eglGetProcAddress() will return NULL for
 glEGLImageTargetTexture2DOES
 glEGLImageTargetRenderbufferStorageOES

which is better than returning the address of the wrong implementation.

the correct fix is more involved.

Change-Id: I585a1f40e564f862e5dd382224609ccd069cd3b5
2010-11-09 14:41:13 -08:00
Jason Sams
083f0fa400 Merge "Fix fountain bug with more than 10 touches reported." 2010-11-09 14:23:06 -08:00
Joe Onorato
92cd276cd9 Merge "fix the build. more string disambiguaiton." 2010-11-09 12:56:30 -08:00
Joe Onorato
07ac879a72 Merge "If the image wallpaper fails to load, including via an OutOfMemoryError because of a big bitmap, reset to the default." 2010-11-09 12:27:07 -08:00
James Dong
7957a060ab Merge "Rotation support" 2010-11-09 11:58:37 -08:00
Andreas Huber
eda787b4b6 Merge "Added a commandline option "-x" to the stagefright commandline tool." 2010-11-09 11:37:59 -08:00
Jesse Wilson
d23599d5f1 Merge "Update current.xml to be in sync with deprecated tags." 2010-11-09 11:34:20 -08:00
Huahui Wu
89dbcc94ef Merge "b/2864818 use authType for cert verification." 2010-11-09 11:31:26 -08:00
Jesse Wilson
52ac3a72ba am 2d2f10fa: am 28c74257: Add @Deprecated to match @deprecated where it\'s missing.
* commit '2d2f10fa3412adc07a08c25ba5d2df600fb654bf':
  Add @Deprecated to match @deprecated where it's missing.
2010-11-09 10:26:39 -08:00
Jesse Wilson
ca5bd68482 Merge "Test to demonstrate that HTTP cookie hostnames aren't case-sensitive." 2010-11-09 10:25:04 -08:00
Jesse Wilson
6f047ffffe am 28c74257: Add @Deprecated to match @deprecated where it\'s missing.
* commit '28c742573ccaeb55c16bc02fb25fdd86b8d1f76a':
  Add @Deprecated to match @deprecated where it's missing.
2010-11-09 10:17:33 -08:00
Scott Main
7886b68f61 am 86372ec4: am 9eb48bb2: Merge "docs: revisions to ndk release notes" into gingerbread
* commit '86372ec41c2ec23917fabff56b786edbb94e24d9':
  docs: revisions to ndk release notes
2010-11-09 09:43:51 -08:00
Gilles Debunne
5dc3845de0 Merge "Amended 9patch border documentation" 2010-11-09 09:36:38 -08:00
Scott Main
154a3d9e99 am 9eb48bb2: Merge "docs: revisions to ndk release notes" into gingerbread
* commit '9eb48bb2b1627ef8182d260f8b3fd080c57bed4d':
  docs: revisions to ndk release notes
2010-11-09 09:35:24 -08:00
Scott Main
2fcbe03d87 Merge "docs: revisions to ndk release notes" into gingerbread 2010-11-09 09:30:30 -08:00
Iain Merrick
161a2cb91e Merge "Include .php tests in DumpRenderTree2." 2010-11-09 08:15:33 -08:00
Chet Haase
60d790618f Merge "Fix GL rendering of translucent surfaces" 2010-11-09 07:14:23 -08:00
Jeff Hamilton
ff3d392949 am cc798d96: am 2e2983c6: Merge "Reduce log clutter." into gingerbread
* commit 'cc798d9675b105775c9736fc68b68d7c8cd0c5a7':
  Reduce log clutter.
2010-11-09 07:06:02 -08:00
Jeff Hamilton
20aaf81143 am 2e2983c6: Merge "Reduce log clutter." into gingerbread
* commit '2e2983c6efe0e4223086e4675b715ed0e20e8d26':
  Reduce log clutter.
2010-11-09 06:59:33 -08:00
Jeff Hamilton
b2973f20e8 Merge "Reduce log clutter." into gingerbread 2010-11-09 06:54:51 -08:00
Steve Block
eeb74ae7df Merge changes I650518a4,If15fddac
* changes:
  Fix DumpRenderTree2 to not attempt to read expected results over HTTPS
  Fix FsUtils.readDataFromUrl() to do the network request on a background thread
2010-11-09 06:32:13 -08:00
Wu-cheng Li
39c1bb1906 am 482083c5: (-s ours) am f6bd761f: Use back-facing camera as default in camera/camcorder profile.do not merge
* commit '482083c57fc21516099d4f9987512f649e362960':
  Use back-facing camera as default in camera/camcorder profile.do not merge
2010-11-09 00:02:44 -08:00
Wu-cheng Li
7912413abe Merge "Use back-facing camera as default in camera/camcorder profile." 2010-11-09 00:01:33 -08:00
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
Huahui Wu
c078919a35 Merge "Expose the cert validator to JNI." 2010-11-08 21:00:13 -08:00
James Dong
af29703a8f am 9cebb86c: am 1b2efbca: Merge "Update a comment about when setOrientationHint() should be called" into gingerbread
* commit '9cebb86c95ad4846ecc771e4b40d2dbd5cf1494b':
  Update a comment about when setOrientationHint() should be called
2010-11-08 20:43:10 -08:00
Adam Powell
7075cd3245 am 8bd41ac1: (-s ours) Merge "Fix typo in manual merge" into gingerbread-plus-aosp
* commit '8bd41ac175f8e254d67d31cf020932e4f02d00c5':
  Fix typo in manual merge
2010-11-08 20:43:03 -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
Mathias Agopian
e252c638fd am f8c24a66: am cd43fbb4: Merge "improve sensorservice dumpsys and increase the max sensor rate to 1 ms (1000Hz)" into gingerbread
* commit 'f8c24a66a7318554604ae63d0ae4948c41b0d6e1':
  improve sensorservice dumpsys and increase the max sensor rate to 1 ms (1000Hz)
2010-11-08 20:00:33 -08:00
Adam Powell
3c1c683462 am 3c09ba3f: (-s ours) resolved conflicts for merge of 06fd1dc5 to gingerbread-plus-aosp
* commit '3c09ba3f798c8dafed4846c6782bc489b841cdbb':
  DO NOT MERGE Fix bug 3121030 - Text handles erroneously appear over extract mode IME window
2010-11-08 20:00:26 -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
b62e7782de am 6bb4f67a: am 26153a33: Fix bug 3163052 - always use 32-bit drawing caches when destination window is 32-bit
* commit '6bb4f67ac29b916b8ea4f08b79a7bc46c5844646':
  Fix bug 3163052 - always use 32-bit drawing caches when destination window is 32-bit
2010-11-08 19:25:54 -08:00
James Dong
24ad901f8e am c4a2ead2: am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" into gingerbread
* commit 'c4a2ead2aa5ab4403553e4956ba71b44782f0c84':
  Support extracting thumbnail from rotated video tracks
2010-11-08 19:25:41 -08:00
Andy McFadden
523e20bf68 am d962bca6: am 08686b07: am c10a4773: Set capabilities sooner.
* commit 'd962bca66fb99d437f065e9a7c66e7fe9abac20e':
  Set capabilities sooner.
2010-11-08 19:25:34 -08:00
Justin Ho
76cddaf1fb am 38f1196e: (-s ours) am dee7335b: Merge "DO NOT MERGE - Updated textfield pressed states" into gingerbread
* commit '38f1196e2bf1695810e42b83520575e7837da3a9':
  DO NOT MERGE - Updated textfield pressed states
2010-11-08 19:25:26 -08:00
Scott Main
6da40ca132 am 2487efb0: am 05de5a15: Merge "docs: remove quick start; make it an overview of the steps and go to installing guide" into gingerbread
* commit '2487efb0e01f6e612984f006af09db4eb90ea16c':
  docs: remove quick start; make it an overview of the steps and go to installing guide
2010-11-08 19:24:55 -08:00
Mathias Agopian
c353de72ea am f704645b: am 5fd30540: Merge "possibly fix [2265804] OpenGL GLSurfaceView apps don\'t draw status bar drop shadow correctly" into gingerbread
* commit 'f704645b0ccf6feac9f41c82caf0ec34370a3bd0':
  possibly fix [2265804] OpenGL GLSurfaceView apps don't draw status bar drop shadow correctly
2010-11-08 19:24:13 -08:00
Mathias Agopian
57e1e54587 am 2ab77748: am fe40e9e0: Merge "fix [3148312] Region can access data out of bounds" into gingerbread
* commit '2ab777483c650b12f447a414c8bf9c175e8384e7':
  fix [3148312] Region can access data out of bounds
2010-11-08 19:24:02 -08:00
Wu-cheng Li
b028a3ff7b am 2ee0af48: am a48b70fa: Camera.open() should only return back-facing camera.
* commit '2ee0af48a3ebb4ac1bbf5e867850519b424e5a06':
  Camera.open() should only return back-facing camera.
2010-11-08 19:23:33 -08:00
Wu-cheng Li
02e66e64f8 am 6025ecec: am 17ae3597: Revert "android.hardware.Camera.open only returns back-facing camera."
* commit '6025ecec2a0c37cdd0b25c85f6ffc54e35b42426':
  Revert "android.hardware.Camera.open only returns back-facing camera."
2010-11-08 19:23:15 -08:00
Wu-cheng Li
07f939d40e am 28345ef6: am 07b88fef: android.hardware.Camera.open only returns back-facing camera.
* commit '28345ef6e1171bf5da792bb743c1a986a539ee4b':
  android.hardware.Camera.open only returns back-facing camera.
2010-11-08 19:22:53 -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
Gil Dobjanschi
feb1f40296 Merge "Fix invalidateTransition method" 2010-11-08 19:06:41 -08:00
Gilles Debunne
fbffcdc1ac Merge "Default wallpaper moved to nodpi" 2010-11-08 18:41:25 -08:00