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
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
Dianne Hackborn
11048655eb
Merge "Tweak fragment animations to be more consistent with window anims."
2010-11-08 18:15:16 -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
Xavier Ducrohet
7c7eee1bab
Merge "Layoutlib: more text drawing."
2010-11-08 17:33:27 -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
Dianne Hackborn
3b0c59ab79
Merge "Fix animations to use correct interpolator."
2010-11-08 15:54:34 -08:00
Alex Sakhartchouk
f2769cfbb0
Merge "Moving attrib creation to Mesh. Adding arrays as shader inputs. Removing fixed size arrays."
2010-11-08 15:29:45 -08:00
Joe Onorato
8cfb7b0da0
Merge "make the resolver activity's items visible"
2010-11-08 15:10:19 -08:00
Jaikumar Ganesh
e0f4210dd5
Merge "Add APIs for starting and stopping a virtual call."
2010-11-08 14:07:53 -08:00
Romain Guy
8629f7f290
Merge "Support nested display lists."
2010-11-08 14:03:30 -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
Andreas Huber
cf0cd24af5
am 2e1a8967: (-s ours) resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp
...
* commit '2e1a8967243a88d73f3b3485b07a02aa4f8d16d9':
Support post-decode video rotation.
2010-11-08 13:14:17 -08:00
Joe Onorato
d94206c41d
The CHEEK_TOUCH stuff never worked. Remove it.
...
Bug: 3104906
Change-Id: Ia37236ba1775fc3ec8c111e2e0b85b105e0dea6a
2010-11-08 13:02:58 -08:00
Jeff Brown
8149991234
Tell system server whether the app handled input events.
...
Refactored ViewRoot, NativeActivity and related classes to tell the
dispatcher whether an input event was actually handled by the application.
This will be used to move more of the global default key processing
into the system server instead of the application.
Change-Id: If06b98b6f45c543e5ac5b1eae2b3baf9371fba28
2010-11-08 12:49:43 -08:00
Irfan Sheriff
6a73d8673a
Merge "add frequency band control API"
2010-11-08 12:24:31 -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