Jean-Baptiste Queru
1a2344b8b2
am 09e50cdb: Merge "Reorder lock acquision vs try."
...
* commit '09e50cdbc62938b178f4c9a66b3cec8a466daaa8':
Reorder lock acquision vs try.
2010-11-17 17:16:06 -08:00
Jean-Baptiste Queru
09e50cdbc6
Merge "Reorder lock acquision vs try."
2010-11-17 17:03:10 -08:00
Jean-Baptiste Queru
f4072fcc14
resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp
...
Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8
2010-11-17 16:47:59 -08:00
Jean-Baptiste Queru
8fc378f9f5
Merge "Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter."
2010-11-17 15:10:05 -08:00
Brad Fitzpatrick
8443dd16c2
am 383e95e2: Merge "DropBox: Read until the end of stream has been reached"
...
* commit '383e95e245ceb87a2a6ad6422404ce641f0e08eb':
DropBox: Read until the end of stream has been reached
2010-11-16 09:37:56 -08:00
Brad Fitzpatrick
383e95e245
Merge "DropBox: Read until the end of stream has been reached"
2010-11-16 09:22:31 -08:00
Christian Lindeberg
e9f1881521
DropBox: Read until the end of stream has been reached
...
Read the requested length or until the end of the input stream
has actually been reached.
Change-Id: I01bc0b81eca0225209bdd288dde6a778a19d1e2c
2010-11-16 09:57:54 +01:00
Jonas Schwertfeger
8402903723
Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter.
...
The signatures of the existing buildQuery and buildUnionSubQuery methods include a selectionArgs
parameter that is not actually being used in the method implementations. This parameter leads
to the misconception that SQL paramter substitution is carried out by these methods. I added
new variants of these methods without that parameter and deprecated the old variants.
Change-Id: I1bf770d5c777649e9aac36d93aa93bd65bbcc2a3
2010-11-12 12:18:37 +01:00
Amith Yamasani
f8d2aff41d
am db65907a: Merge "Adding pan behavior on preference dialog."
...
* commit 'db65907a2148f053e51f941979f0f7694acd5923':
Adding pan behavior on preference dialog.
2010-11-11 09:06:02 -08:00
Amith Yamasani
db65907a21
Merge "Adding pan behavior on preference dialog."
2010-11-11 08:50:52 -08:00
Owen Lin
8ffb135dc8
am 45ca778d: Merge "Make sure the controller will get repositioned after size changing." into gingerbread
...
* commit '45ca778d8ed90aff3f72fc85f806cedbd4121cc1':
Make sure the controller will get repositioned after size changing.
2010-11-10 08:25:02 -08:00
Owen Lin
45ca778d8e
Merge "Make sure the controller will get repositioned after size changing." into gingerbread
2010-11-09 19:02:23 -08:00
Mathias Agopian
0e43828799
am b48189cc: Merge "Improve gyro and accelerometer java doc" into gingerbread
...
* commit 'b48189ccfe42a408fb713565e54e165d255c6d66':
Improve gyro and accelerometer java doc
2010-11-09 17:24:57 -08:00
Mathias Agopian
b48189ccfe
Merge "Improve gyro and accelerometer java doc" into gingerbread
2010-11-09 17:12:11 -08:00
Mathias Agopian
fa33565714
Improve gyro and accelerometer java doc
...
Change-Id: If055512cb51d6e3b9f2094a730bf373ca963d97d
2010-11-09 13:53:25 -08:00
Jesse Wilson
2d2f10fa34
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
Jesse Wilson
28c742573c
Add @Deprecated to match @deprecated where it's missing.
...
Change-Id: Ice95022671968386a601f32df7850f9baa1d2dd0
2010-11-09 10:10:11 -08:00
Owen Lin
a8381dfc5e
Make sure the controller will get repositioned after size changing.
...
Bug: 3177061
Change-Id: I8f9606d4e05146ba568e8fe370cfe115dadedab9
2010-11-09 19:32:30 +08:00
Adam Powell
dd11387e58
Fix typo in manual merge
...
Change-Id: Idaf98e368e032cfbd7fbe3aa2d965b04eea3f43e
2010-11-08 19:56:44 -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
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
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
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
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
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
Wu-cheng Li
2ee0af48a3
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
6025ecec2a
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
28345ef6e1
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
Wu-cheng Li
a48b70fa8f
Camera.open() should only return back-facing camera.
...
Also update current.xml and 9.xml. setRotationHint was also
missing from 9.xml.
bug:3173302
Change-Id: Idd3f7417a4d35c65910e9b08a1bfd157b91e1baa
2010-11-09 02:20:02 +08:00
Wu-cheng Li
17ae359721
Revert "android.hardware.Camera.open only returns back-facing camera."
...
This reverts commit 07b88fefd4e6386ad3265da47d008b40e6a58891.
2010-11-09 01:34:05 +08:00
Wu-cheng Li
07b88fefd4
android.hardware.Camera.open only returns back-facing camera.
...
bug:3173302
Change-Id: I813e41b36c776246f151b66ef289cdf13a05dc2c
2010-11-08 12:38:48 +08:00
Jean-Baptiste Queru
c3b112ba20
Merge db2403ff from open-source master
...
Change-Id: I90dfa2f37db901b62690b6becbf5d0d91468672c
2010-11-05 07:53:24 -07:00
Mathias Agopian
1bd80ad7fd
possibly fix [2265804] OpenGL GLSurfaceView apps don't draw status bar drop shadow correctly
...
request a layout when asking the transparent region to be recomputed, without this
it may never happen, since the transparent region is only calculated during layout.
this also fixes an issue where some fullscreen apps will run slower than expected
because their transparent region is never processed.
Change-Id: Iba187ef7b23f08ad3454aaa6707a3d262551e30c
2010-11-04 17:13:39 -07:00
Mathias Agopian
b20c2e7ca0
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
Mathias Agopian
477c4feee2
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
Kevin Powell
34884b409e
[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.
...
Change-Id: I59cacab4c7108cfb4a17fd1021de7473e6faa74f
2010-11-03 16:35:02 -07:00
Jeff Hamilton
1212d4fdc9
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
575a6bbfe0
Remove the My Tag feature.
...
Change-Id: I9167121da2fa66ddae23386d24fef7bcc64eb3f1
2010-11-03 15:32:40 -05:00
Brad Fitzpatrick
db2403ff32
Merge "Add support for UAProf header in HTTP requests"
2010-11-03 11:38:06 -07:00
Jason parks
bcbf17a582
am 73eba2a6: Merge "Return a zero length byte from toByteArray instead of null." into gingerbread
...
* commit '73eba2a6bcf39eb20d815517ed11e1a7fb7a2c39':
Return a zero length byte from toByteArray instead of null.
2010-11-02 19:00:12 -07:00
Jason parks
3ebd59bb5d
Return a zero length byte from toByteArray instead of null.
...
Change-Id: I67b388099c72a0d2ec6b429caea8f29bf8f7a75a
2010-11-02 20:03:52 -05:00
Brad Fitzpatrick
f3a6b90191
am 9df48a03: Merge "NotificationManager: droiddoc documentation improvements"
...
* commit '9df48a0305818122298a86ae9949f6688814928b':
NotificationManager: droiddoc documentation improvements
2010-11-02 15:00:06 -07:00
Brad Fitzpatrick
9df48a0305
Merge "NotificationManager: droiddoc documentation improvements"
2010-11-02 14:55:21 -07:00
Nick Pelly
6fb9316f6b
am 38e561dd: Merge "Remove timeout support." into gingerbread
...
* commit '38e561dd3cd72160035d8b3002fc9bbaf3071374':
Remove timeout support.
2010-11-02 14:49:35 -07:00
Jean-Baptiste Queru
c91e46730d
am bbd212d7: Merge "Document per-implementation behaviors of native get* methods"
...
* commit 'bbd212d77852be155a815a0d2ad1da0df2c0dfe1':
Document per-implementation behaviors of native get* methods
2010-11-02 14:18:07 -07:00
Jean-Baptiste Queru
0b5d57ab7e
am 715f8610: Merge "Clarify documentation of Cursor get* methods."
...
* commit '715f86107763ee95e7d6558dd8da390a63da63e2':
Clarify documentation of Cursor get* methods.
2010-11-02 14:18:02 -07:00
Nick Pelly
275708c82c
Remove timeout support.
...
The implementation was guarenteed to cause deadlock when a timeout was set.
Change-Id: I59444ea784eb9057c6c4c9e9123f558b3ef5eef6
Signed-off-by: Nick Pelly <npelly@google.com>
2010-11-02 16:13:52 -05:00
Daniel Trebbien
adf4194458
Document per-implementation behaviors of native get* methods
...
Change-Id: I5d20d7796b85ce62750dd50dd79e47d76716b24c
2010-11-02 09:35:12 -07:00
Daniel Trebbien
65068b099e
Clarify documentation of Cursor get* methods.
...
Make clear in the Javadoc comments of the `Cursor` get* methods that
implementations thereof can have implementation-defined behavior. In some cases,
these changes actually correct the documentation. For example, in the case of
`getShort` and the `SQLiteCursor` implementation thereof, non-numeric data is
*not* converted to a `short` via Short#valueOf or even in a functionally-
equivalent manner.
Change-Id: Ib2f81811a603680b52fc482eb9c0f3195447566f
2010-11-02 09:24:07 -07:00