11674 Commits

Author SHA1 Message Date
Vasu Nori
7d977de3d0 Merge "when corruption occurs, not clsing the db is casuing stack overflow" 2010-06-22 13:13:16 -07:00
Romain Guy
af002cf12c Merge "Fix the simulator build." 2010-06-22 13:12:44 -07:00
Romain Guy
85bf02fc16 Fix the simulator build.
Change-Id: Ie404f7c2c308f0657f273af19a56e8c039b61898
2010-06-22 13:11:24 -07:00
Vasu Nori
5666170c1e when corruption occurs, not clsing the db is casuing stack overflow
due to a bug in DefaultDatabaseErrorHandler, if the corruption is
so bad that the list of attached databases can't even be retrieved,
then database is not closed in DefaultDatabaseErrorHandler,
this causes the corrupted file to remain on disk.
this causes corruption detection to occur forever until the stack
overflows.

Change-Id: I9896bee220231cbde0b1620ad0a617420424967c
2010-06-22 12:22:31 -07:00
Dianne Hackborn
e3e2883f22 am e24a60aa: Merge "First stab at attaching native event dispatching." into gingerbread
Merge commit 'e24a60aa4670fb835772b23ff665bb368fa65e30' into gingerbread-plus-aosp

* commit 'e24a60aa4670fb835772b23ff665bb368fa65e30':
  First stab at attaching native event dispatching.
2010-06-22 11:26:02 -07:00
Dianne Hackborn
a95e4cb62f First stab at attaching native event dispatching.
Provides the basic infrastructure for a
NativeActivity's native code to get an object representing
its event stream that can be used to read input events.

Still work to do, probably some API changes, and reasonable
default key handling (so that for example back will still
work).

Change-Id: I6db891bc35dc9683181d7708eaed552b955a077e
2010-06-22 11:21:50 -07:00
Daniel Sandler
57b5326561 am ef730e6e: Merge "Fix javadocs." into gingerbread
Merge commit 'ef730e6ececa96a3e0576140eea707f7c48cd66c' into gingerbread-plus-aosp

* commit 'ef730e6ececa96a3e0576140eea707f7c48cd66c':
  Fix javadocs.
2010-06-22 11:10:18 -07:00
Daniel Sandler
8091ca5015 Fix javadocs.
Change-Id: Ic37c16625ddd0175cc048dd2b22bc75c6962d43d
2010-06-22 13:58:46 -04:00
Grace Kloba
ef7fa7bc66 Merge "Add a WebSettings to control whether WebView will use some perf trick, e.g. pause updating the picture, during panning and zooming transition." 2010-06-22 10:39:18 -07:00
Daniel Sandler
71764c4ce5 am 613dde4a: Revised "immersive mode" API.
Merge commit '613dde4aa651e11dac3db859723cc6faf8fc0a82' into gingerbread-plus-aosp

* commit '613dde4aa651e11dac3db859723cc6faf8fc0a82':
  Revised "immersive mode" API.
2010-06-22 09:36:07 -07:00
Daniel Sandler
613dde4aa6 Revised "immersive mode" API.
No longer a window bit, FLAG_IMMERSIVE is now set on
ActivityInfo.flags and in the Activity's manifest as
android:immersive="true" (ActivityInfo).

[An "immersive" activity is one that wishes to avoid being
paused by full-screen notifications (like an incoming call).
An activity that sets FLAG_IMMERSIVE/android:immersive is
sending a signal to the notification manager, status bar,
etc. that they should try to find some other way to get the
user's attention in high-priority situations.]

[Originally: change Ie290c2e.]

Change-Id: I967bb10b930b8f0772b10f81f2957a03fa3f1736
2010-06-22 12:30:12 -04:00
Mike Lockwood
dae19d7c00 am aaf39f84: Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread
Merge commit 'aaf39f84063b8fee51bcdb0731d68c328b6a3c3d' into gingerbread-plus-aosp

* commit 'aaf39f84063b8fee51bcdb0731d68c328b6a3c3d':
  GPS: remove GpsEventThread from GpsLocationProvider
2010-06-22 06:45:03 -07:00
Mike Lockwood
aaf39f8406 Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread 2010-06-22 06:44:03 -07:00
Mike Lockwood
f602d362ba GPS: remove GpsEventThread from GpsLocationProvider
Rather than polling for events from the native code in an event thread,
we now require the GPS HAL libraries to call our callbacks from a thread
that is registered with the JVM to call directly into Java.
This eliminates a thread from our code and removes one step in the chain
of message passing from the GPS to the Location Manager client.

Change-Id: I2745a157690310ba9a699a8369f54a7366c6b1ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-22 09:26:41 -04:00
Ben Murdoch
ac68873bf5 Merge "Web runtime - link following with simple SOP check - back button - fullscreen (title shown as toast for now)" 2010-06-22 05:45:43 -07:00
Jack Palevich
1e08cc1dfd am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
Merge commit '224107a421e2611b15d1ec736df54bca9ee3e78d' into gingerbread-plus-aosp

* commit '224107a421e2611b15d1ec736df54bca9ee3e78d':
  Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
2010-06-22 05:16:24 -07:00
Jack Palevich
224107a421 Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
Change-Id: Id0069535e97fe96eef74e4d0c1d19b010061fe3b
2010-06-22 20:08:40 +08:00
Grace Kloba
f9b731d383 Add a WebSettings to control whether WebView will
use some perf trick, e.g. pause updating the picture,
during panning and zooming transition.

Fix http://b/issue?id=2784020
2010-06-21 19:23:57 -07:00
Gilles Debunne
57f4e5bcf5 Fixed scrolling issue when moving cursor in long TextViews.
Previous CL https://android-git.corp.google.com/g/55138 was submitted
before the suggested change was uploaded.

setSelection() was called twice by onTouchEvent, once to the previous
position, and then to the new position (unless the IME got displayed,
so that in that case the cursor is not moved).

The second call was actually triggering a call for a scroll of 0 since
the view is already displaying the cursor. This scroll is filtered out by a
shortcut in ScrollView. The first setSelection's scroll does not have
the same issue (since the previous cursor's position is out of screen
and requires a scroll) and it is then applied, effectively moving the cursor
to a new position but scrolling to the previous position.

The fix is to call setSelection only once, after the IME has been asked
to display. The cursor is moved to the old/new position depending on the
resultCode in onReceiveResult in CommitSelectionReceiver.

Bug: http://b/issue?id=2778954
Change-Id: I157d7ae451574e8a6fffb894eb1d6880acfe01d1
2010-06-21 17:34:58 -07:00
Gilles Debunne
f4362e478a Merge "Fixed scrolling issue when moving cursor in long TextViews." 2010-06-21 16:56:15 -07:00
Daniel Lehmann
cb1f6074a3 Merge "Remove ContactHeaderWidget, because it lives directly in the Contacts App from now on" 2010-06-21 16:36:58 -07:00
Adam Powell
fb00b2b1e8 Merge "Changes for bluetooth keyboard support." 2010-06-21 16:36:57 -07:00
Daniel Lehmann
2c63fe44f4 Remove ContactHeaderWidget, because it lives directly in the Contacts App from now on
Change-Id: I1d3646f2744e01a1e64db8787b4cd7dd746d540e
2010-06-21 16:27:49 -07:00
Adam Powell
df7627db71 Changes for bluetooth keyboard support.
Add device class constant for PROFILE_HID and check for
Device.Major.PERIPHERAL when checking for class matches.

Change UUID for HID support.

Fix bug in BluetoothService.

Change-Id: Ie5361257d90fd749249e915824564bc3d79fb95d
2010-06-21 16:23:42 -07:00
Gilles Debunne
bbb5d6e256 Fixed scrolling issue when moving cursor in long TextViews.
setSelection() was called twice by onTouchEvent, once to the previous
position, and then to the new position (unless the IME got displayed,
so that in that case the cursor is not moved).

The second call was actually triggering a call for a scroll of 0 since
view is already displaying the cursor. This scroll is filtered out by a
shortcut in ScrollView. The first setSelection's scroll does not have
the same issue (since the previous cursor's position is out of screen
and requires a scroll) and it then applied, effectively moving the cursor
to a new position but the scrolling to the previous position.

The fix is to call setSelection only once, after the IME has been asked
to display. The cursor is moved to the old/new position depending on the
resultCode in onReceiveResult in CommitSelectionReceiver.

Bug: http://b/issue?id=2778954
Change-Id: I0983fdf18993e63b230e093e703f95efe6e2d7a8
2010-06-21 16:22:07 -07:00
Mathias Agopian
bf9009396b am 7e73a2ce: Merge "Improve SensorManager documentation" into gingerbread
Merge commit '7e73a2ce17740abd028d9944c423e191e5b4854c' into gingerbread-plus-aosp

* commit '7e73a2ce17740abd028d9944c423e191e5b4854c':
  Improve SensorManager documentation
2010-06-21 15:12:14 -07:00
Mathias Agopian
7e73a2ce17 Merge "Improve SensorManager documentation" into gingerbread 2010-06-21 15:10:13 -07:00
Jeff Brown
b1efc3f682 am 7fbdc84e: More native input event dispatching.
Merge commit '7fbdc84e87dd3a0e196b9803bb04495d11e9cb8a' into gingerbread-plus-aosp

* commit '7fbdc84e87dd3a0e196b9803bb04495d11e9cb8a':
  More native input event dispatching.
2010-06-21 14:06:31 -07:00
Jeff Brown
7fbdc84e87 More native input event dispatching.
Added ANRs handling.
Added event injection.
Fixed a NPE ActivityManagerServer writing ANRs to the drop box.
Fixed HOME key interception.
Fixed trackball reporting.
Fixed pointer rotation in landscape mode.

Change-Id: I50340f559f22899ab924e220a78119ffc79469b7
2010-06-21 13:59:34 -07:00
Jean-Baptiste Queru
3b9f0a33a1 Recover a handful of commits that were reverted earlier 2010-06-21 13:46:59 -07:00
Vasu Nori
05dd626a95 Merge "fix broken test similar to I32c30f7d05e5bec7c6b2776ce9a80c8be61d856f" 2010-06-21 13:18:00 -07:00
Kenny Root
9a76eb568d am 0fcfa0a5: am f25c560d: am 30cf330f: Import revised translations
Merge commit '0fcfa0a53f92f32d50870c246763da30a106d13a'

* commit '0fcfa0a53f92f32d50870c246763da30a106d13a':
  Import revised translations
2010-06-21 11:37:10 -07:00
Andrew Stadler
359cf08fb6 Merge "Add getWrappedCursor, and update the JavaDoc." 2010-06-21 11:35:51 -07:00
The Android Open Source Project
6c9a30045b merge from froyo-plus-aosp
Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd
2010-06-21 11:23:45 -07:00
Kenny Root
0fcfa0a53f am f25c560d: am 30cf330f: Import revised translations
Merge commit 'f25c560dcdc0c04e11152fff11f521dae03522cd' into gingerbread-plus-aosp

* commit 'f25c560dcdc0c04e11152fff11f521dae03522cd':
  Import revised translations
2010-06-21 11:20:28 -07:00
Kenny Root
f25c560dcd am 30cf330f: Import revised translations
Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into gingerbread

* commit '30cf330fae137587d51aa4c026459db146705ba9':
  Import revised translations
2010-06-21 11:17:07 -07:00
Kenny Root
30cf330fae Import revised translations
Change-Id: I4b91aea9c53332569a7123fdb32141530ede6d3d
2010-06-21 11:03:50 -07:00
Vasu Nori
8208529cd7 Merge "journal_mode should be set only on non-memory databases" 2010-06-21 10:46:29 -07:00
Vasu Nori
194897da94 journal_mode should be set only on non-memory databases
setting journal_mode to TRUNCATE on memory databases causes an error message
to be displayed by SQLIteDatabase.

Change-Id: Ie8b8ae22cb9fba99cee59dba35b260195c63eadc
2010-06-21 10:41:14 -07:00
Andrew Stadler
46baf533f5 Add getWrappedCursor, and update the JavaDoc.
Change-Id: I7d0513056b4d83b457374d783465fe848b7e530c
2010-06-21 10:23:52 -07:00
Kenny Root
ab8aa51aa6 am b2ce04c2: am cfe3d205: am c4e38577: Import revised translations
Merge commit 'b2ce04c2ea2f4628d665127f8737d535e5b352de'

* commit 'b2ce04c2ea2f4628d665127f8737d535e5b352de':
  Import revised translations
2010-06-21 10:16:48 -07:00
Shimeng (Simon) Wang
ad45686d72 Add dumpChildFramesAsText function support in LayoutTestController.
Change-Id: I8af0bbca1d2166a25486d5a12fb6a985bbe264ef
2010-06-21 10:05:34 -07:00
Kenny Root
b2ce04c2ea am cfe3d205: am c4e38577: Import revised translations
Merge commit 'cfe3d205b065502eecc460f7713de90e19d4ab4b' into gingerbread-plus-aosp

* commit 'cfe3d205b065502eecc460f7713de90e19d4ab4b':
  Import revised translations
2010-06-21 09:08:51 -07:00
Kenny Root
cfe3d205b0 am c4e38577: Import revised translations
Merge commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17' into gingerbread

* commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17':
  Import revised translations
2010-06-21 09:02:13 -07:00
Ben Murdoch
c530f36003 Web runtime
- link following with simple SOP check
 - back button
 - fullscreen (title shown as toast for now)

Change-Id: I6c64dd87b2f216f02a1d0ee4e7e5d51067ca80ee
2010-06-21 12:18:17 +01:00
Kenny Root
c4e38577f4 Import revised translations
Change-Id: Ife82312cc21acc144a70718f79afcafbdd7eda7a
2010-06-20 18:54:45 -07:00
The Android Open Source Project
f1f33c4eb2 merge from open-source master
Change-Id: If7ae0c5629d1b3c540cacfa517425c2e6b5822d1
2010-06-18 12:46:16 -07:00
The Android Open Source Project
766d1b7458 merge from open-source master
Change-Id: I05e4c26c902f3cfe0dd99107f518768b246562f7
2010-06-18 12:44:20 -07:00
The Android Open Source Project
e5a023bfbb merge from open-source master
Change-Id: I8e7ccd470e8b90347686985aa2d8337d0c38900c
2010-06-18 12:40:42 -07:00
Adam Powell
7ade1be822 Action bar button layout changes.
Theme attribute added for spacing between action buttons. Action
buttons are now allowed to fill up to half of the total action bar's
width.

Change-Id: Iabbc67e695684529dfae9681d4d9580cd30839d0
2010-06-18 10:12:20 -07:00