13848 Commits

Author SHA1 Message Date
Vasu Nori
efd09ef46d am 3045bbaf: bug:3330569 print better message to help debug the problem
* commit '3045bbaf58574ad3168466b198b835b29d174c18':
  bug:3330569 print better message to help debug the problem
2011-01-10 15:49:20 -08:00
Vasu Nori
3045bbaf58 bug:3330569 print better message to help debug the problem
methods such as SQLiteStatement.simpleQueryForString() expect
one and only row to be returned when the query is executed.
if the application provides a query that doesn't return any data,
then the error message printed is pretty confusing.

make it less confusing and print the query itself to help debug
the error.

Change-Id: Ife2066f3a3eab0b98845a49e8f72b518458a7757
2011-01-10 15:37:47 -08:00
Dmitri Plotnikov
774cd32e0c am 817b3f93: Fixing field description.
* commit '817b3f934271115258838d5cc4903ad5a2bef0f3':
  Fixing field description.
2011-01-10 15:32:06 -08:00
Dmitri Plotnikov
817b3f9342 Fixing field description.
PhoneLookup._ID is the contact id, not the data row id.

Change-Id: I51a308e26b93e178fde43123d0dfcb2b46630d6e
2011-01-10 15:29:54 -08:00
Huahui Wu
ddf50607d1 am 0904c0dc: b/3302354 Always pass multi-touch events into WebKit, then handle them in WebView if preventDefault is not set. WebViewCore.java: add a MotionEvent field into TouchEventData for multi-touch so the extra data such as pressure, size can be preserved. WebVie
* commit '0904c0dcfb11da9bb756b8d4f8a817b5efc9edc0':
  b/3302354 Always pass multi-touch events into WebKit, then handle them in WebView if preventDefault is not set. WebViewCore.java: add a MotionEvent field into TouchEventData for multi-touch so the extra data such as pressure, size can be preserved. WebView.java:   1. Extracted the common code for multi-touch and single touch to a new private function: handleTouchEventCommon()   2. Extracted the multi-touch code, including zooming and panning, to a new private function: handleMultiTouchInWebView()   3. In onTouchEvent(), single touch events keep the code path, but multi-touch events are always passed to Webkit first.   4. In Privatehandler.handleMessage(), if WebKit didn't consume the multi-touch event, the private handler calls the handleMultiTouchInWebView() to zoom and pan.
2011-01-10 15:25:05 -08:00
Huahui Wu
0904c0dcfb b/3302354 Always pass multi-touch events into WebKit, then handle them in WebView if preventDefault is not set.
WebViewCore.java: add a MotionEvent field into TouchEventData for multi-touch so the extra data such as pressure, size can be preserved.
WebView.java:
  1. Extracted the common code for multi-touch and single touch to a new private function: handleTouchEventCommon()
  2. Extracted the multi-touch code, including zooming and panning, to a new private function: handleMultiTouchInWebView()
  3. In onTouchEvent(), single touch events keep the code path, but multi-touch events are always passed to Webkit first.
  4. In Privatehandler.handleMessage(), if WebKit didn't consume the multi-touch event, the private handler calls the handleMultiTouchInWebView() to zoom and pan.

Change-Id: I3eba8812bd7cf6a298ff12e0b66223dae6725060
2011-01-10 15:22:03 -08:00
Subir Jhanb
ebc5f20a26 am e896be71: Making the sync manager take the data connected value from ConnectivityManager and not from the intent. BUG:3337128
* commit 'e896be71c70c7aaa86886fec1044c53e93c42621':
  Making the sync manager take the data connected value from ConnectivityManager and not from the intent. BUG:3337128
2011-01-10 14:40:01 -08:00
Subir Jhanb
e896be71c7 Making the sync manager take the data connected value from ConnectivityManager and not from the intent.
BUG:3337128

Change-Id: Ife2705569fcdde1b201773d6622a8a9d0b7ccfa1
2011-01-10 14:18:09 -08:00
Romain Guy
67c796da27 am 778f5f95: Merge "Make sure onCancelled() is called if cancel() is called early." into honeycomb
* commit '778f5f95d7f74ac12bc426c37dd1fc7abc05e15b':
  Make sure onCancelled() is called if cancel() is called early.
2011-01-10 13:41:45 -08:00
Romain Guy
778f5f95d7 Merge "Make sure onCancelled() is called if cancel() is called early." into honeycomb 2011-01-10 13:39:41 -08:00
Romain Guy
5ba812b9e9 Make sure onCancelled() is called if cancel() is called early.
In some situations, when cancel() was called before the task had a
chance to start its execution, onCancelled() would not be invoked.

Change-Id: I6c1f4cd28a209fb8cc779bb212f500565dfceaae
2011-01-10 13:33:12 -08:00
Jesse Wilson
48526d6994 am eb97c0dd: Patch new JSON APIs with changes informed by GSON.
* commit 'eb97c0ddc063176c26065fc6855188edf0c16e03':
  Patch new JSON APIs with changes informed by GSON.
2011-01-10 12:59:59 -08:00
Jesse Wilson
eb97c0ddc0 Patch new JSON APIs with changes informed by GSON.
Change-Id: I86c12a123080cc06ab23d11d1563bb52c5902517
2011-01-10 12:56:31 -08:00
Gilles Debunne
e79ea1dbc7 am b3fbd7e0: Merge "Stop text selection mode when new text replaces selection." into honeycomb
* commit 'b3fbd7e0fd44a72fb7ccba0959481b8a806608b7':
  Stop text selection mode when new text replaces selection.
2011-01-10 12:51:25 -08:00
Gilles Debunne
b3fbd7e0fd Merge "Stop text selection mode when new text replaces selection." into honeycomb 2011-01-10 12:49:23 -08:00
Leon Scroggins
f5f13669bb am e0b19124: Merge "Do not store the find callback until action mode starts." into honeycomb
* commit 'e0b1912480d3c5cfa3f4cf3dd9d7cddd10d68c63':
  Do not store the find callback until action mode starts.
2011-01-10 12:47:11 -08:00
Leon Scroggins
19abf2d7a5 Do not store the find callback until action mode starts.
Bug:3331652

Prevents a bug where showFindDialog was apparently
called twice.

Change-Id: Ida473ef1b9b1b8b641fa3432b55d7a92eb7d0808
2011-01-10 15:29:01 -05:00
Gilles Debunne
d94f8c5055 Stop text selection mode when new text replaces selection.
Rationalized the use of hideControllers and stopSelectionActionMode.

Hiding the selection controller should be done exclusively by stoping text selection
mode.

Bug 3322636

Change-Id: I30b4a651aa5fb5a865d636bec495a2b96ef114cd
2011-01-10 11:29:15 -08:00
Leon Scroggins
0efb38b479 am 9cac3c31: Remove the option to use shift to start selection mode.
* commit '9cac3c31d29134f9bf4de10765b81ed45c13d31a':
  Remove the option to use shift to start selection mode.
2011-01-10 11:05:19 -08:00
Leon Scroggins
9cac3c31d2 Remove the option to use shift to start selection mode.
Bug:3329956

Also ensure that keys dispatched while the WebTextView
is attached get sent to the WebTextView.

Change-Id: Icd9125a85929089a6f376b71c1cb40e885264168
2011-01-10 13:57:38 -05:00
Gilles Debunne
917369844f am 58f750ad: Merge "Fix for an NPE in Account settings on long press." into honeycomb
* commit '58f750ad145e6920c1c75bed8b333e54d78f3fed':
  Fix for an NPE in Account settings on long press.
2011-01-10 10:15:48 -08:00
Gilles Debunne
58f750ad14 Merge "Fix for an NPE in Account settings on long press." into honeycomb 2011-01-10 10:12:59 -08:00
Adam Cohen
1613b5ba7b am 4c894519: Merge "Fixing bug where StackView doesn\'t clip it\'s children correctly" into honeycomb
* commit '4c8945191c60a92123c3df15a1f0a737a7084449':
  Fixing bug where StackView doesn't clip it's children correctly
2011-01-10 10:08:19 -08:00
Adam Cohen
4c8945191c Merge "Fixing bug where StackView doesn't clip it's children correctly" into honeycomb 2011-01-10 10:06:19 -08:00
Adam Cohen
488672148c Fixing bug where StackView doesn't clip it's children correctly
Change-Id: Icb051fa355c5c1b92f81d56f04efd4f8699c65a4
2011-01-10 10:04:01 -08:00
Gilles Debunne
b0db5940c9 Fix for an NPE in Account settings on long press.
Bug 3333512

Change-Id: Ief79e824b86b964598f00ef74c6b5c61c0730242
2011-01-10 10:00:37 -08:00
Cary Clark
0c62f82bbb am b74e32cc: Merge "add more alt key acceleration in webview" into honeycomb
* commit 'b74e32cc7ded9b26c1ba1e1bcff98fc9e7128562':
  add more alt key acceleration in webview
2011-01-10 09:57:02 -08:00
Cary Clark
b74e32cc7d Merge "add more alt key acceleration in webview" into honeycomb 2011-01-10 09:55:54 -08:00
John Reck
17147ee327 am 36fd7a39: Tweak user agent building to avoid multiple spaces
* commit '36fd7a39caafac26ea3d56ffc924bce0a53092f1':
  Tweak user agent building to avoid multiple spaces
2011-01-10 09:50:53 -08:00
John Reck
36fd7a39ca Tweak user agent building to avoid multiple spaces
Bug: 3211038
 The building of the user agent could previously have multiple sequential
 spaces. This was causing the CTS test to fail.

Change-Id: I13fc76ba6b97ee84dd44461b4d03b6ca70b48cdf
2011-01-10 09:48:13 -08:00
Leon Scroggins
c7fe090d2f am aa6b9f55: Do not show autofill++ or saved form data in incognito mode.
* commit 'aa6b9f55d60702211dd2d08403c7296347f0bd7d':
  Do not show autofill++ or saved form data in incognito mode.
2011-01-10 08:32:56 -08:00
Cary Clark
a3ee56f4ae add more alt key acceleration in webview
Make key accceleration exact; if alt is required,
allow only alt, and so on.

Also, set the touch point when nav'ing with the arrows
or trackball so that context menus have a point to
work with.

bug:3301564
bug:3241968
Change-Id: I574ce145941e84ac0934efd323d9db71eec11663
2011-01-10 11:20:56 -05:00
Leon Scroggins
aa6b9f55d6 Do not show autofill++ or saved form data in incognito mode.
Bug:2968399

Also do not save the form data in incognito mode.

Change-Id: Ice6a1cb3620b5cf272b6b361ce11f8abef269a89
2011-01-10 11:02:00 -05:00
Cary Clark
297c1acc79 am 8733bea4: Merge "scroll selected text in scrollable layers" into honeycomb
* commit '8733bea4c1631cf1d6758c45d5f2a279f7d66eed':
  scroll selected text in scrollable layers
2011-01-10 07:29:03 -08:00
Cary Clark
8733bea4c1 Merge "scroll selected text in scrollable layers" into honeycomb 2011-01-10 07:25:33 -08:00
Cary Clark
b9aaa776a6 scroll selected text in scrollable layers
Compute whether the initial tap point is in
a scrollable layer or not. If it is, get
the bounds of the scrollable layer and use them,
clipped to the view, to determine when the
select anchor is dragged close to the layer's
edge, to invoke autoscrolling.

Fix some bugs around stopping the autoscrolling
when there is nothing to do, and when a motion
up event is sent.

requires companion change in external/webkit

bug:3191699
Change-Id: Ic9229b063a8102ec93d0cd5bcaba774cc170c106
2011-01-10 09:10:25 -05:00
Adam Powell
38f0c2ee8a am 8b50495d: Merge "Fix bug 3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb
* commit '8b50495d02a6423bfa5c8cf6406e3e06b7c84f7f':
  Fix bug 3324981 - Inconsistent/buggy FastScroll behavior
2011-01-09 21:39:49 -08:00
Adam Powell
8b50495d02 Merge "Fix bug 3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb 2011-01-09 21:38:05 -08:00
Adam Powell
32c3a6929a Fix bug 3324981 - Inconsistent/buggy FastScroll behavior
The fast scroller now always positions by index position.

Fixed a bug with always-show fast scrollers.

Change-Id: I08586ab2aae9733e78aa823aff711bcc14d2d44d
2011-01-09 21:34:21 -08:00
Jeff Hamilton
e3db3d6209 Merge commit '525f953b' into manualmerge
Conflicts:
	api/current.xml

Change-Id: I6cbde67b8da6b85def6e3ddd985b0e04edf279a7
2011-01-09 21:01:56 -06:00
Romain Guy
b6c4f7904a am 867b1f60: Merge "Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883" into honeycomb
* commit '867b1f60e6c2fff4650e5edc4409b26c9c605f00':
  Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883
2011-01-09 16:44:14 -08:00
Romain Guy
867b1f60e6 Merge "Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883" into honeycomb 2011-01-09 16:42:35 -08:00
Romain Guy
72f0a276ff Better documentation for FLAG_HARDWARE_ACCELERATED
Bug #3154883

Change-Id: I2062781ba3b447b8ec4e0836b9ddeaa97c7aa60e
2011-01-09 16:45:28 -08:00
Brett Chabot
d320877f32 am 3b4fcbc9: Add ActivityManager#isRunningInTestHarness() public API.
* commit '3b4fcbc9f13bab6a2e9e5c37cc5e18fec7341c04':
  Add ActivityManager#isRunningInTestHarness() public API.
2011-01-09 16:35:59 -08:00
Brett Chabot
3b4fcbc9f1 Add ActivityManager#isRunningInTestHarness() public API.
Replaces use of ro.monkey system property. This new API is controlled by
ro.test_harness.

Bug 3329873

Change-Id: Idb5bbbd9ca691976ef842eec681be34c29915976
2011-01-09 16:31:11 -08:00
Jim Miller
b3a82ebd6e am 730f0b23: Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb
* commit '730f0b238a20362ff0ae6bdfbd069f0996fc1b39':
  Fix 3299611: Use system font for AM/PM indicator
2011-01-09 16:10:19 -08:00
Jim Miller
730f0b238a Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb 2011-01-09 16:08:58 -08:00
Jim Miller
81f9b286d1 Fix 3299611: Use system font for AM/PM indicator
This fixes a bug where translations wouldn't pick up the proper
AM/PM indicator because AndroidClock.ttf doesn't contain the
full Android character set for translations.

Change-Id: I61737bae7383946906a4e6b776afa7463da9355d
2011-01-09 16:03:27 -08:00
Romain Guy
d0b8365fcb Return the View that matches the clicked position.
Bug #3323669

Change-Id: If6093885283f962d20bf287ba8b82d7c76f9076c
2011-01-09 15:41:04 -08:00
Romain Guy
e03e47b2f3 am d0b8365f: Return the View that matches the clicked position. Bug #3323669
* commit 'd0b8365fcbe891b0bb3b54d345337f60c292d09e':
  Return the View that matches the clicked position. Bug #3323669
2011-01-09 15:39:14 -08:00