Adam Powell
b765d32e81
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
Adam Powell
848ae6e48b
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
d1959717c2
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
76526a1f55
am d962bca6: am 08686b07: am c10a4773: Set capabilities sooner.
...
* commit 'd962bca66fb99d437f065e9a7c66e7fe9abac20e':
Set capabilities sooner.
2010-11-08 19:25:34 -08:00
Justin Ho
02117bd50a
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
762323b180
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
0440f023dc
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
a0e6929a26
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
0a514792ed
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
0bae616364
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
f90a0e84fe
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
3c09ba3f79
resolved conflicts for merge of 06fd1dc5 to gingerbread-plus-aosp
...
Change-Id: Iae11cabdc3c6b6b59dfdcc3b4944088dded91a52
2010-11-08 19:21:58 -08:00
Gil Dobjanschi
8346ad0a8f
Merge "Fix invalidateTransition method"
2010-11-08 19:06:41 -08:00
Gil Dobjanschi
549a65b5a4
Fix invalidateTransition method
...
Change-Id: I12d5b7256d2956007b65c8304053717dd7b9b7ef
2010-11-08 18:44:43 -08:00
Gilles Debunne
4aa2fe500a
Merge "Default wallpaper moved to nodpi"
2010-11-08 18:41:25 -08:00
Xavier Ducrohet
7f77524395
Layoutlib: Load fragments
...
This change does the following:
- Make the bridge context extend Activity instead of Context
so that it can act as a view factory. This is needed because
the Activity is used as factory for Fragment objects.
- Override the default Fragment.instantiate(...) method
through a delegate. This is done to load the Fragment
classes located in the project (similar to custom views).
Change-Id: If62e7c9ff2b7585677077ad825aa1c3591d1b5e0
2010-11-08 18:38:12 -08:00
Adam Powell
6bb4f67ac2
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
Gilles Debunne
03fcf85528
Default wallpaper moved to nodpi
...
Change-Id: I21f9bf0037e820941e48b3942c43504dcdfcea2b
2010-11-08 18:24:32 -08:00
James Dong
c4a2ead2aa
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
d962bca66f
am 08686b07: am c10a4773: Set capabilities sooner.
...
* commit '08686b0755a841d343249ac951db4ec2d7770cba':
Set capabilities sooner.
2010-11-08 18:19:34 -08:00
Dianne Hackborn
c9f32f2332
Merge "Tweak fragment animations to be more consistent with window anims."
2010-11-08 18:15:16 -08:00
Adam Powell
06fd1dc5bf
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
Adam Powell
26153a33df
Fix bug 3163052 - always use 32-bit drawing caches when destination
...
window is 32-bit
Change-Id: I0b6de28eb2de583e1d10d0a65c1ab534ef5bb047
2010-11-08 18:09:12 -08:00
Gilles Debunne
91a08cfc4f
Rationalized singleLine in TextView, take 2.
...
Same as CL 77435, but without the default singleLine value change.
Change-Id: I04794ed72716bbe5a285d2bbbb3f536308e5972f
2010-11-08 18:03:45 -08:00
Justin Ho
38f1196e2b
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
d2d62d04fc
Merge "Support extracting thumbnail from rotated video tracks" into gingerbread
2010-11-08 18:00:14 -08:00
Andy McFadden
08686b0755
am c10a4773: Set capabilities sooner.
...
* commit 'c10a4773ece6ca66ba9cfe4cd15e5987a02bee68':
Set capabilities sooner.
2010-11-08 17:58:50 -08:00
Justin Ho
dee7335b8f
Merge "DO NOT MERGE - Updated textfield pressed states" into gingerbread
2010-11-08 17:49:57 -08:00
Justin Ho
185c527073
DO NOT MERGE - Updated textfield pressed states
...
Change-Id: I96a582895c4393349f7f88ced8fb625181379b47
2010-11-08 17:45:09 -08:00
Xavier Ducrohet
010e2c2997
Merge "Layoutlib: more text drawing."
2010-11-08 17:33:27 -08:00
Jason Sams
1c41517124
Handle user message ID 0
...
Pass RS runtime errors back to java.
throw exceptions for runtime errors.
Change-Id: Ifcf16cbbf9b98137971dced5076f8a5563eb016c
2010-11-08 17:19:31 -08:00
Dianne Hackborn
0ff229f292
Tweak fragment animations to be more consistent with window anims.
...
Use same deceleration curves, same style for forward/backward nav.
2010-11-08 17:12:23 -08:00
Andy McFadden
c10a4773ec
Set capabilities sooner.
...
(cherry-pick from gingerbread I4e34b60c0a01b85ce0d80eb96ff3510604a68c71)
Bug 3176774
Change-Id: I34d36b5b215ff0465f4f2f148c675f37ceba1a78
2010-11-08 17:11:22 -08:00
James Dong
53ebc72fd8
Support extracting thumbnail from rotated video tracks
...
Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
2010-11-08 16:52:59 -08:00
Xavier Ducrohet
e0c763f54f
Layoutlib: more text drawing.
...
Change-Id: I32f46d23e746b095be0577a53b61567a868f0b8a
2010-11-08 16:13:28 -08:00
Ficus Kirkpatrick
553a53ef9f
Make saveRecentQuery() async.
...
Bug: 3163612
Change-Id: Idd3c1925e0f1dc3272dd1303d8f2907c5c5fca8b
2010-11-08 16:11:54 -08:00
Scott Main
2487efb0e0
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
05de5a15a3
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
9f1425431f
Merge "Fix animations to use correct interpolator."
2010-11-08 15:54:34 -08:00
Alex Sakhartchouk
3fe599ce21
Merge "Moving attrib creation to Mesh. Adding arrays as shader inputs. Removing fixed size arrays."
2010-11-08 15:29:45 -08:00
Dianne Hackborn
6908cd154c
Fix animations to use correct interpolator.
...
Also some fragment fixes.
Change-Id: I3906199e541a86379d07c8a4e4d5f9e99830c44a
2010-11-08 15:28:12 -08:00
Alex Sakhartchouk
9d71e21800
Moving attrib creation to Mesh. Adding arrays as shader inputs.
...
Removing fixed size arrays.
Change-Id: I0213e403a2f1283dd43f21bea770aeb059561903
2010-11-08 15:10:52 -08:00
Joe Onorato
98b8bc7f9a
Merge "make the resolver activity's items visible"
2010-11-08 15:10:19 -08:00
Joe Onorato
646f46eddf
make the resolver activity's items visible
...
Change-Id: Ic02c834c01c3d71d6e1c073f986b87ae5faa1da0
2010-11-08 15:08:56 -08:00
Adam Powell
36ffc5c960
DO NOT MERGE Fix bug 3121030 - Text handles erroneously appear over
...
extract mode IME window
Make the SelectionModifierCursorController track its show/hide state
more accurately in the presence of an extract mode IME.
Lazily initialize CursorControllers so that we don't end up creating
them for various TextViews where they are not needed.
Change-Id: Ib76a95d9e7669016cf11b8b0add8843b438068ea
2010-11-08 15:00:49 -08:00
Jaikumar Ganesh
1bc0177328
Merge "Add APIs for starting and stopping a virtual call."
2010-11-08 14:07:53 -08:00
Romain Guy
d8acf9b682
Merge "Support nested display lists."
2010-11-08 14:03:30 -08:00
Mathias Agopian
f704645b0c
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
2ab777483c
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
5fd3054048
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