Commit Graph

10997 Commits

Author SHA1 Message Date
Mike Lockwood
8eb25c28c0 Merge "Move CursorWindow class from core/jni to libbinder" 2010-05-28 10:24:29 -07:00
Wu-cheng Li
9222832882 am 3ed1da35: am 198975bb: Merge "Add video frame parameter." into kraken 2010-05-28 09:35:20 -07:00
Mike Lockwood
2807df89af Move CursorWindow class from core/jni to libbinder
To allow use of the native CursorWindow class outside of the core framework jni

Change-Id: I72e8dcb91a2c691130c33cdfd9a25d343da1c592
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-28 10:08:21 -04:00
Wu-cheng Li
198975bb01 Merge "Add video frame parameter." into kraken 2010-05-28 04:34:13 -07:00
Wu-cheng Li
d2c2929c94 Add video frame parameter.
The image format of preview frames and video frames may be different.
We need another parameter for video frame format.

bug:2720893
Change-Id: I966a31b0ce8cab25cdde65db65a18c8cbe9c7bd6
2010-05-28 17:32:41 +08:00
Kenny Root
8e98e35e8f am 50239de1: am ddbab4e1: am 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo 2010-05-27 23:05:47 -07:00
Konstantin Lopyrev
a15dcfaf2b Fix 2677197: Adding minimum complex character support.
Change-Id: I520bc5f9aa924bf9b5585b2235a91cc96cb99c25
2010-05-27 15:27:06 -07:00
Kenny Root
ddbab4e165 am 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
Merge commit '6cc137459a21e67765d2490529a920ccfb14e362' into kraken

* commit '6cc137459a21e67765d2490529a920ccfb14e362':
  Fix typo in EastAsianWidth javadoc
2010-05-27 12:37:28 -07:00
Kenny Root
6cc137459a am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
Merge commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641' into froyo-plus-aosp

* commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641':
  Fix typo in EastAsianWidth javadoc
2010-05-27 12:35:25 -07:00
Leon Scroggins
acea08d20f Prevent a null pointer exception.
Bug 2721268

Change-Id: I3a9e838ed3f2f9dccdf7b4bf42a0dbad58e62e02
2010-05-27 15:09:32 -04:00
Kenny Root
94f1751cb0 Merge "Fix typo in EastAsianWidth javadoc" into froyo 2010-05-27 12:04:34 -07:00
Amith Yamasani
9bd8034a1a Fix a comment typo. 2010-05-27 11:31:26 -07:00
Amith Yamasani
8b932067c1 Merge "Add a battery capacity value to the power profile." 2010-05-27 10:49:08 -07:00
Amith Yamasani
bed865932f Add a battery capacity value to the power profile.
Can be accessed through PowerProfile.getBatteryCapacity()

Individual device profiles need to be updated with their capacities.
2010-05-27 10:37:54 -07:00
Grace Kloba
178db41234 Experimental feature: use WebKit to find out the selection
highlight.

The new setting, supportTouchOnly(), is currently not
fully implemented. It is overloaded with mLightTouchEnabled
for short term testing. To test the feature, please
use the "Enable Light Touch" in the debug settings.

When supportTouchOnly is true, we are not using nav
cache to display the yellow ring. Instead we show 
the gray rectangle(s) based on the calculation from
WebKit. When short press happens, we current use 0
for mMoveGeneration so that it will trigger WebKit
to use the same point when it calculates the highlight.

If you turn on NavDump in the debug settings, it will
also draw the fat point where you tap on the screen.

Known issues, it is not fully synced with IME. If you
tap a text input box also in focus, the yellow ring
will show up. If you leave the text input field, the
IME is not dismissed. If this passes the user tests,
we will make a special mode and fix all these issues.

There is another matching CL in external/webkit
2010-05-27 09:22:42 -07:00
Kenny Root
18b221af46 Fix typo in EastAsianWidth javadoc
The Javadoc had a missing close <code> tag and also failed to mention
the "start" parameter in the doc.

Change-Id: I861d6646e82e1d49f23a09de8b68a61f81689f83
2010-05-27 06:41:59 -07:00
Steve Block
6f48790cb1 Merge "Merge WebKit at r60074: Update UA string" 2010-05-27 03:27:08 -07:00
Ben Murdoch
a3f055e205 Fix layout test failure with fast/events/touch/touch-stale-node-crash.html
This layout test is currently failing due to timing out in DRT.

The issue is that the test sends a down, up, down sequence quickly. For
each down event, we post a PREVENT_DEFAULT_TIMEOUT message to the
WebView's message handler. WebCore responds to the first touch event and
we update the mPreventDefault state variable correctly. The second touch down
resets mPreventDefault as it's the start of a new touch sequence and a second touch down is posted
to the WebCore thread.

At this point we still have the first TIMEOUT message in the WebView queue. The problem occurs
when the WebView processes this timeout message before the WebCore thread processes the second
touch down message. In this case the WebView clears the WebCore thread's message queue and instead posts
touch cancel events, erroneously removing the second touch event. This timeout message should not have been
processed as it was associated with the first touch down that had already been completed. Without the
second touch the test never completes.

The fix is to remove PREVENT_DEFAULT_TIMEOUT messages from the queue before starting
a new touch sequence.

Change-Id: Ief054239529d710a79a0e58a589bd7a92434dbf2
2010-05-27 10:41:55 +01:00
Jim Miller
dc0f4f059c Merge "Fix 2584857: Reset grabbed state when SlidingTab visibility changes" 2010-05-26 13:22:26 -07:00
Jim Miller
5ee2a771b5 am 14f56a0b: am b35cd7dd: Merge "Fix 2667859: change text back to default size" into kraken 2010-05-26 11:42:33 -07:00
Robert Greenwalt
585d6e11af Merge "resolved conflicts for merge of 3cd6a3e3 to master" 2010-05-26 11:40:53 -07:00
Robert Greenwalt
d1c3ea6a21 resolved conflicts for merge of 3cd6a3e3 to master
Change-Id: If3e45cc3494b2c52a1f1dcc19deff763a50498d7
2010-05-26 10:37:48 -07:00
Vasu Nori
23a42230af Merge "when sqlite returns SQLITE_OK on SQLITEStatement.execute(), ignore it" 2010-05-26 10:27:40 -07:00
Vasu Nori
d72ec5f29d when sqlite returns SQLITE_OK on SQLITEStatement.execute(), ignore it
if it is not ignored AND if SQLITEStatement.execute() is called with a SELECT
or a pragma or some sql statement that returns data, caller gets an exception
with a weird error: "error code 100: unknown error"
to avoid confusion generated by this exception, just write a warning
and ignore the returned data.
Change-Id: I8f0225ceff8f92e32a58f323551e5ada6df63593
2010-05-26 10:14:41 -07:00
Steve Block
c9946d5bde Merge WebKit at r60074: Update UA string
Change-Id: I9d42c86f20f917ef7799169b3e34149bfc630f5d
2010-05-26 12:32:08 +01:00
Jim Miller
92c1571f0a Fix 2584857: Reset grabbed state when SlidingTab visibility changes
This fixes a case where the widget is hidden while the grabbed
state is set. The result is that the host of the widget is never
informed that the grabbed state changed.

Change-Id: I78b41cff0e31e982a3b46f0319260ba59815092c
2010-05-25 19:20:36 -07:00
Jim Miller
b35cd7dde5 Merge "Fix 2667859: change text back to default size" into kraken 2010-05-25 17:13:18 -07:00
Jim Miller
bae698cd54 Fix 2667859: change text back to default size
This reverts a change described in the above bug where
the font size got changed to 22dip.

Change-Id: I42e2dc06e94aba003fa00032b265c986959ce939
2010-05-25 16:53:45 -07:00
Robert Greenwalt
ac53a8a135 am 88ccecf5: am d1055a25: Make the NTP Cache max-age gservices-settable
Merge commit '88ccecf573a52648052bc9c7858f345776f76e0e' into kraken

* commit '88ccecf573a52648052bc9c7858f345776f76e0e':
  Make the NTP Cache max-age gservices-settable
2010-05-25 16:15:37 -07:00
Robert Greenwalt
88ccecf573 am d1055a25: Make the NTP Cache max-age gservices-settable
Merge commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp

* commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
  Make the NTP Cache max-age gservices-settable
2010-05-25 16:13:22 -07:00
Robert Greenwalt
d1055a250c Make the NTP Cache max-age gservices-settable
Trying to make Throttle polling more energy efficient.

bug:2708119
Change-Id: I2b75639e202dcbcee11047c43407a22de04ce350
2010-05-25 15:54:52 -07:00
Daisuke Miyakawa
a14aded514 Merge "Add KDDI/Softbank to available Shift_Jis mapping." 2010-05-25 15:22:35 -07:00
Derek Sollenberger
03e4891571 Refactoring more webview zoom code into ZoomManager.
This CL is #2 of multiple CL's to remove the zoom code
from webview and place it into webkit.ZoomManager. Each
commit is only part of the entire refactoring so there
are many ZoomManager.* variables still referenced from
WebView.

Change-Id: I21f6517dff46b65a277bc67120ffabe043098e5e
http://b/2671604
2010-05-25 18:04:06 -04:00
Daisuke Miyakawa
df3f1cc3fe Add KDDI/Softbank to available Shift_Jis mapping.
Bug: 2689523
Change-Id: I5140bd02a5e30b323eb19b1b0eb2dcf17027f878
2010-05-25 14:10:09 -07:00
Wink Saville
97692e6da2 Merge "Add needsOtaServiceProvisioning to Phone." 2010-05-25 11:20:30 -07:00
Leon Scroggins
eb51f3e340 Check for null before using Layout.
Bug 2713024

Change-Id: Iaad5c774fa1e16c341d481104f8fd38f7add3082
2010-05-25 11:33:03 -04:00
Kristian Monsen
02263fd2f0 Merge WebKit at r59636: Update UA string
Change-Id: Ic5b0a03ad53f2e81f5aeb6e32b2f92902b83fdb2
2010-05-25 11:11:57 +01:00
Mathias Agopian
c1600ae869 am 36893612: am d6ddcb7f: fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and fail 2010-05-24 19:13:52 -07:00
Mathias Agopian
d6ddcb7f00 fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and fail
force all SurfaceView to 565

Change-Id: I8ebfa1239d8e4fa097c2e544677fb92fa20b39bd
2010-05-24 19:07:08 -07:00
Wink Saville
4d8ae85b5d Add needsOtaServiceProvisioning to Phone.
By having needsOtaServiceProvisioning supported on all phones we
eliminate the need to use an if statement to discriminate phone type.
Types of phones that don't support OTASP will return false in the
default implementation in PhoneBase.

Change-Id: I8fb15a18553e314c1f8f2a00ec7f8cffd79eeb7f
2010-05-24 17:50:32 -07:00
Konstantin Lopyrev
3255823de0 Fix 2673731: Adding support for password history to Device Admin.
Change-Id: If3240048813e32b2bae79fe5cb8a73aea20ec56c
2010-05-24 17:13:18 -07:00
Adam Powell
e46c1e817c am 49551ca4: am 9a559970: am f67c874c: am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children. 2010-05-24 16:30:16 -07:00
Adam Powell
9a559970a3 am f67c874c: am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Merge commit 'f67c874c07d2e0ff888cc88679f884a833f89870' into kraken

* commit 'f67c874c07d2e0ff888cc88679f884a833f89870':
  Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:26:06 -07:00
Adam Powell
f67c874c07 am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Merge commit '7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp

* commit '7e5e3745cf0103219a13071fbd488c3c01da85d9':
  Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:23:53 -07:00
Adam Powell
7e5e3745cf Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Change-Id: I21b37647c5ad16e4f57fdda433e3b3ee2c7c83ad
2010-05-24 15:13:41 -07:00
Daniel Sandler
8c8634b514 am c8a041f1: am 450da449: Merge "New shadowy status bar, direct from Z\'ha\'dum." into kraken 2010-05-24 05:49:05 -07:00
Vasu Nori
4e0b1a7e9d Merge "sqlite crashes when closing the database" 2010-05-21 15:48:33 -07:00
Vasu Nori
fea6f6dcb7 sqlite crashes when closing the database
A change was made in the last CL to ask sqlite for all unfinalized statements
and then finalizing them before closing the database.
But this crashes sqlite! because sqlite's FTS3
module keeps some prepared statements around and they should not
be finalized before closing the database.
(when sqlite is asked for all unfianlized statements, it also returns
the FTS3's reserved prepared statements which should not be
finalized!!)

Change-Id: I141ab4563985b8cd1305a1228c4cb01bc7281bcb
2010-05-21 15:41:58 -07:00
Daniel Sandler
2c195f77a1 New shadowy status bar, direct from Z'ha'dum.
Artwork is FPO but serviceable enough. Many hardcoded font
colors & styles were moved to styles.xml where they belong.
AM/PM finally given the old heave-ho (but configurable in
StatusBarPolicy.java).

Notification content remains on a light-gray background for
now (so as not to screw up custom RemoteViews) but status
icons will definitely need across-the-board rework to look
better against a dark background.

Change-Id: Id9d5a699532f9336563cd6f9699bff3893735e4f
2010-05-21 15:46:54 -04:00
Ben Murdoch
fa296a4c90 Add a string for the no file chosen label, shown on a file upload control when the user has not yet picked a file.
Requires external/webkit change.

Change-Id: Idb1039a7c39b18249579794df523afb6144fba47
2010-05-21 10:18:35 +01:00