11031 Commits

Author SHA1 Message Date
Doug Felt
c982f60e98 Fix alignment issues with RTL paragraphs.
Also remove unused debugging code that depends on junit.
Remove trailing whitespace in changed code.

Change-Id: Ie02d1b8220c599a672ee6e91af0fba634e0f620c
2010-06-03 13:33:00 -07:00
Kenny Root
3e7432f823 Merge "Fix IndexOutOfBoundsException when measuring text." 2010-06-02 16:21:31 -07:00
Doug Felt
2324188751 Fix IndexOutOfBoundsException when measuring text.
Some line wrapping conditions caused the same style run to be measured
twice, incorrectly advancing the position in the width buffer and
occasionally causing measurement to run out of room.  The fix is to
not remeasure the same style run.

Change-Id: Iceb29729c1c27bb602df20fdf83af1da28c82e11
2010-06-02 14:41:06 -07:00
Romain Guy
812ccbeb3c Add new hardwareAccelerated manifest attribute to enable HW drawing.
Change-Id: I2bb0252f3699cb720e7f5b6868419c9904e4fb35
2010-06-02 10:41:59 -07:00
The Android Open Source Project
76b704982a am 8f1259be: am b705eea7: am 1bd7597b: merge from open-source master 2010-06-02 09:06:34 -07:00
The Android Open Source Project
b705eea702 am 1bd7597b: merge from open-source master
Merge commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0' into kraken

* commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0':
  Replaced raw string arguments for Context.getSystemService() with final Context variables
2010-06-02 09:03:04 -07:00
The Android Open Source Project
ed06eccce0 am afca60dd: am 59c82376: am c8763858: merge from open-source master 2010-06-02 08:58:37 -07:00
The Android Open Source Project
59c82376e5 am c8763858: merge from open-source master
Merge commit 'c8763858cfcae8be89c0f88df87bf9a3ad90ae64' into kraken

* commit 'c8763858cfcae8be89c0f88df87bf9a3ad90ae64':
  Fix for issue 895 (missing android: prefix), Removed unused imports
2010-06-02 08:54:59 -07:00
The Android Open Source Project
1bd7597b8c merge from open-source master
Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb
2010-06-02 08:54:47 -07:00
The Android Open Source Project
c8763858cf merge from open-source master
Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6
2010-06-02 08:41:59 -07:00
Ben Murdoch
347d50fb1f Merge "Frameworks changes to enable File Reader and blob.slice APIs." 2010-06-02 04:29:39 -07:00
Grace Kloba
ec9a104ce9 If the WebView can't be scaled, don't check for
double tap. This will make the click event on the
non-scalable page much responsive.

Fix http://b/issue?id=2645880
2010-06-01 19:00:23 -07:00
Grace Kloba
6660740cfa Merge "Expose canZoomIn and canZoomOut for WebView." 2010-06-01 17:23:37 -07:00
Konstantin Lopyrev
10280fc8fa Merge "Fix 2571872: Showing an error message on wrong password/pin entered." 2010-06-01 17:14:13 -07:00
Konstantin Lopyrev
f9a166ab82 Fix 2571872: Showing an error message on wrong password/pin entered.
Change-Id: I78463112326ebd1ac7d43d083e22d506518e84fd
2010-06-01 17:00:47 -07:00
Dan Egnor
dd27f14da2 am b8dd6b19: am 1e1e292e: am 1f5e8473: am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo 2010-06-01 16:10:49 -07:00
Grace Kloba
6164ef1b78 Expose canZoomIn and canZoomOut for WebView. 2010-06-01 16:09:58 -07:00
Wu-cheng Li
e28f7b80d3 am c3cfd10a: am 00e21f8e: Add javadoc for camera scene modes. 2010-06-01 16:09:32 -07:00
Dan Egnor
1e1e292edc am 1f5e8473: am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
Merge commit '1f5e847350ef1aece046666e20e7692a1651d9dc' into kraken

* commit '1f5e847350ef1aece046666e20e7692a1651d9dc':
  Comment-only change to add documentation for FileObserver
2010-06-01 14:44:35 -07:00
Dan Egnor
1f5e847350 am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
Merge commit 'a80331c4d75cb8a7122e31315bc1e2950131659c' into froyo-plus-aosp

* commit 'a80331c4d75cb8a7122e31315bc1e2950131659c':
  Comment-only change to add documentation for FileObserver
2010-06-01 14:28:46 -07:00
Romain Guy
a393a85d2b Fix build warnings about improper ASCII encoding.
Change-Id: I5f26278e74a0a7018059db75ca44a36c42c559f3
2010-06-01 14:06:24 -07:00
Derek Sollenberger
3af4a2c6bb Merge "eoving Zoom animation logic from WebView into ZoomManager. This is pick bad5ede Revert "Refactor the on-screen zoom controls into a separate class."" 2010-06-01 13:52:17 -07:00
Vasu Nori
7e6eaa9a90 Merge "set sqlite pagesize to the size, in bytes, of a block on "/data"" 2010-06-01 13:12:01 -07:00
Vasu Nori
a8c24904eb set sqlite pagesize to the size, in bytes, of a block on "/data"
Change-Id: I40b2bdac348a611eb9fe12ea05b6bd9a87f2310a
2010-06-01 13:03:32 -07:00
Derek Sollenberger
87b17be55e eoving Zoom animation logic from WebView into ZoomManager. This is
pick bad5ede Revert "Refactor the on-screen zoom controls into a separate class."

one part of a series of CL's that is intended to refactor all zoom
logic into the ZoomManager.

Change-Id: I6260c7d2daade4861df1296c9db364ee2a892bd0
http://b/2671604
2010-06-01 15:03:53 -04:00
Ben Murdoch
65b4cdabb0 Frameworks changes to enable File Reader and blob.slice APIs.
Rather than just storing the name of the file that the user chose in the file picker,
store the full path to the file. That way we can open it using the file API and still
extract the filename itself by simply chopping off all but the last path segment.

Change-Id: I25f2fe818deda8ca848f0da02cf45ae97d2127fb
2010-06-01 19:29:38 +01:00
Grace Kloba
c8f302fb5d Merge "merge two restore scale to one." 2010-06-01 10:19:59 -07:00
Shimeng (Simon) Wang
06c40631ff Merge "Add English hyphenation dictionary into frameworks/base asset." 2010-06-01 10:05:47 -07:00
Christian Mehlmauer
ef367529f9 Replaced raw string arguments for Context.getSystemService() with final Context variables
Change-Id: If5139a1526101292e5da557bfad3f4db80fb64a8
2010-05-31 23:08:30 +02:00
Dan Egnor
3dc1c7f5e8 Comment-only change to add documentation for FileObserver
Change-Id: Icd9bc65be020a23f78c8bcda78fc68e7d05c93b4
2010-05-31 12:17:12 -07:00
Wu-cheng Li
00e21f8eb5 Add javadoc for camera scene modes.
Change-Id: Iab596a6fb77107ffc04fa59d84e18f8e064e336a
2010-05-31 16:41:14 +08:00
Grace Kloba
e80cbcc051 merge two restore scale to one.
There is a matching CL in external/webkit
2010-05-28 18:07:50 -07:00
Shimeng (Simon) Wang
bcf8591c85 Add English hyphenation dictionary into frameworks/base asset.
issue: 2672163
Change-Id: Idf3ff164f41ae95448519b14666f03fb59dada97
2010-05-28 16:25:08 -07:00
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