12776 Commits

Author SHA1 Message Date
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
Xia Wang
f55c973637 am d0a8f54a: Merge "Add Wi-Fi connection functional tests." into gingerbread
* commit 'd0a8f54a5bcd6a10eaaa88d888c3cbb83869532c':
  Add Wi-Fi connection functional tests.
2010-11-16 09:16:54 -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
Xia Wang
ca1f2b1a1e Add Wi-Fi connection functional tests.
- Add a XML parser to parse Wi-Fi configurations
- Add Wifi connection tests
- Fix issue: failure in setup will block the next tests.
             call tearDown() if the test fails at setUp().

Change-Id: I1a380fa02ebc96b69165d1514da12df985224e8d
2010-11-15 15:10:44 -08: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
Jeff Hamilton
4934d3361e Revert "Merge "Remove the My Tag feature." into gingerbread"
This reverts commit ef5694692f88bb91ed6ee1191b11a66ec594ff39, reversing
changes made to 65816a32ee2c2181895e3be636f3173a6e769f67.
2010-11-11 20:42:28 -06:00
Eric Fischer
9acf04ab6a am 3082e5fe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '3082e5fed04c42301c89de8df36e9d62f0937dec':
  Import revised translations.  DO NOT MERGE
2010-11-11 15:49:03 -08:00
Eric Fischer
3082e5fed0 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-11-11 15:44:04 -08: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
Ben Murdoch
1708ad53c3 Hide plugin views when we start playing HTML5 video
Plugins like Flash draw directly to the screen on top
of all other views - including the fullscreen HTML5 video
view. This means that if you start an HTML5 video on a page
also serving a flash clip then flash will obscure the video.

This patch hides plugin views before start the video and shows
them again when the VideoView is destroyed.

Bug: 3183521
Change-Id: I9839c47e9d64b081651b952057e9283630362b29
2010-11-11 16:07:26 +00:00
Dianne Hackborn
63f40387d9 am 34594e75: Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread
* commit '34594e75e4a7962840f34c0b57116ecf1497f118':
  Fix issue #3177284: Account for wake lock power usage on Crespo
2010-11-10 18:01:21 -08:00
Dianne Hackborn
34594e75e4 Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread 2010-11-10 17:58:28 -08:00
Jeff Brown
5314335c9e am 00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
* commit '00e5dd44f6d014fff8c65b9c718f5641f5eae4bb':
  Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
2010-11-10 16:04:13 -08:00
Jeff Brown
00e5dd44f6 Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread 2010-11-10 16:00:37 -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
Eric Fischer
d41f638c8a Import revised translations. DO NOT MERGE
Change-Id: I6178ba6468bf9e1dd52a83652c857a6e75f2661b
2010-11-09 12:15:41 -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
Jeff Hamilton
cc798d9675 am 2e2983c6: Merge "Reduce log clutter." into gingerbread
* commit '2e2983c6efe0e4223086e4675b715ed0e20e8d26':
  Reduce log clutter.
2010-11-09 06:59:33 -08:00
Jeff Hamilton
2e2983c6ef Merge "Reduce log clutter." into gingerbread 2010-11-09 06:54:51 -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
Dianne Hackborn
0c8b4d3f7e Fix issue #3177284: Account for wake lock power usage on Crespo
Change-Id: I5e3d6c4772f08277ee775dba191a5054dd5a4ca2
2010-11-08 19:10: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
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
Justin Ho
185c527073 DO NOT MERGE - Updated textfield pressed states
Change-Id: I96a582895c4393349f7f88ced8fb625181379b47
2010-11-08 17:45:09 -08:00
Jeff Brown
8f6068e63e Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
This change ensures that the native activity releases the KeyEvent
objects that it allocates since they will not be released
automatically and eventually the JNI slot table will overflow
and crash the process.

Bug: 3170494
Change-Id: I2ea527f056096fae9bc9e7685dccb56ec7a0e8b4
2010-11-08 16:03:13 -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
Jeff Hamilton
5629d51f22 Reduce log clutter.
Change-Id: Ia034b563b028d74b4878f1af7db9188c82d03548
2010-11-08 13:18:49 -06: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
Scott Main
04856d99f8 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
c3b112ba20 Merge db2403ff from open-source master
Change-Id: I90dfa2f37db901b62690b6becbf5d0d91468672c
2010-11-05 07:53:24 -07:00
Mattias Petersson
19f22745aa Prevent system crash when OOM in Binder thread.
When handling large images during an update of a widget,
we can run out of memory in the Binder thread. This will
cause an OutOfMemoryError to be thrown. When an Error is
thrown in the Binder thread, the entire system will crash.
This was fixed by catching this OutOfMemoryError and instead
throw a RuntimeException to keep the system alive.

Change-Id: If27199676c6f8aef23fb249be1197ca5dfe0fe99
2010-11-05 08:27:14 +01:00
Scott Main
6e88c84cbe docs: remove allowClearUserData from <application> manifest doc
and clarify in javadocs that it's only for system apps
bug: 3128020

Change-Id: Ibc01f0e24f7d1f4e76a4da0a324c7682b92992aa
2010-11-04 18:45:05 -07:00