Shimeng (Simon) Wang
3ba9717e3c
am c1960a60: Merge "Change function parameter from int to float." into honeycomb
...
* commit 'c1960a602037fc4a421e56794bbc581e650b3bcb':
Change function parameter from int to float.
2011-01-11 12:30:35 -08:00
Shimeng (Simon) Wang
c1960a6020
Merge "Change function parameter from int to float." into honeycomb
2011-01-11 10:54:43 -08:00
Shimeng (Simon) Wang
5d8e7a444c
Change function parameter from int to float.
...
This change has a corresponding change in external/webkit:
https://android-git.corp.google.com/g/#change,88118
issue: 3225233
Change-Id: Icff31ef5c440cb02671ed363f57a0a5549cb32ef
2011-01-11 10:52:44 -08:00
Robert Greenwalt
24bc5331cd
am cef29578: Merge "Change local names for greater clarity." into honeycomb
...
* commit 'cef295780ade72a26201c0c92ed2b64fde03a261':
Change local names for greater clarity.
2011-01-11 10:18:05 -08:00
Robert Greenwalt
cef295780a
Merge "Change local names for greater clarity." into honeycomb
2011-01-11 10:15:21 -08:00
Robert Greenwalt
1b744ca49c
Change local names for greater clarity.
...
Change-Id: I806284317c0c756260080b6c006b4c338b9cbc6d
2011-01-11 10:08:31 -08:00
Shimeng (Simon) Wang
fa1f3de00f
am eafbce55: Ignore overflow:hidden in overview mode.
...
* commit 'eafbce55714dbd1f89fe8c131d9c2adcbbc9383e':
Ignore overflow:hidden in overview mode.
2011-01-11 09:59:17 -08:00
Shimeng (Simon) Wang
eafbce5571
Ignore overflow:hidden in overview mode.
...
The feature was enabled to prevent flash sites from flickering due to
viewport height change when the site is scrolled.
Now fixed viewport height is in honeycomb, this flickering shall be
a non-issue. So to support better scrolling of overflow:hidden sites
and better consistency, overflow:hidden in overview mode is ignored
as well.
Tested on flash site http://home.disney.go.com/mwc.index to make sure
no flickering happens. More testing shall be done once good flash
player is there.
issue: 3330038
Change-Id: Ia3f61ce49cfb970d26976d4e876c337d210a9df2
2011-01-11 09:56:35 -08:00
Leon Scroggins
99263fecdc
am d5208cf4: Merge "Enable write ahead logging on databases used by WebView." into honeycomb
...
* commit 'd5208cf42c0f9b281505cb465b4de4e8179a6f9f':
Enable write ahead logging on databases used by WebView.
2011-01-11 09:26:57 -08:00
Leon Scroggins
d5208cf42c
Merge "Enable write ahead logging on databases used by WebView." into honeycomb
2011-01-11 09:24:39 -08:00
Chet Haase
44efd13afc
am 53ee3316: Rename RGBEvaluator to ArgbEvaluator
...
* commit '53ee3316bcb3590ff156b3fd7108903c0817c35d':
Rename RGBEvaluator to ArgbEvaluator
2011-01-11 07:05:37 -08:00
Chet Haase
53ee3316bc
Rename RGBEvaluator to ArgbEvaluator
...
Change-Id: Iee74b475960d623fa757349e4053bd7c58cf5734
2011-01-11 06:46:44 -08:00
Romain Guy
87e55cdcf5
am 89254c98: Merge "Better logging of out of memory errors in OpenGLRenderer." into honeycomb
...
* commit '89254c984e8197c2d60ce6c1da3b11b8d445bf9f':
Better logging of out of memory errors in OpenGLRenderer.
2011-01-10 21:13:24 -08:00
Romain Guy
89254c984e
Merge "Better logging of out of memory errors in OpenGLRenderer." into honeycomb
2011-01-10 21:11:27 -08:00
Romain Guy
a07105b7d2
Better logging of out of memory errors in OpenGLRenderer.
...
Change-Id: I6b72a084340d8d4b6e0b0a100ed4314d09d441ef
2011-01-10 21:14:18 -08:00
Mike Lockwood
374816d47a
am 3459e27e: un@hide android.os.Environment.isExternalStorageEmulated()
...
* commit '3459e27e5d2f92d2d5487c189c9386c031e79fc1':
un@hide android.os.Environment.isExternalStorageEmulated()
2011-01-10 19:38:44 -08:00
Mike Lockwood
3459e27e5d
un@hide android.os.Environment.isExternalStorageEmulated()
...
Change-Id: I35e7dc59763595523cb5af569e237bcff5cf1b49
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-10 22:12:31 -05:00
Adam Powell
98b2fec9b5
am 5c5fa339: Merge "Fix bug 3333015 - Overflow menu item submenus do not open" into honeycomb
...
* commit '5c5fa339b4658287217eb0a4639e6e52d192f0ab':
Fix bug 3333015 - Overflow menu item submenus do not open
2011-01-10 17:38:59 -08:00
Joe Onorato
cb649050a9
am e5e95588: Merge "add ComponentInfo.isEnabled()" into honeycomb
...
* commit 'e5e9558871df227a09420fed6f16c33e6af0e3e7':
add ComponentInfo.isEnabled()
2011-01-10 17:36:42 -08:00
Adam Powell
5c5fa339b4
Merge "Fix bug 3333015 - Overflow menu item submenus do not open" into honeycomb
2011-01-10 17:35:34 -08:00
Joe Onorato
e5e9558871
Merge "add ComponentInfo.isEnabled()" into honeycomb
2011-01-10 17:33:18 -08:00
Leon Scroggins
919022f916
am 86e1fa64: Remove nativeCursorMatchesFocus, which is no longer necessary.
...
* commit '86e1fa647f7541b091753cf6a2314935b1011406':
Remove nativeCursorMatchesFocus, which is no longer necessary.
2011-01-10 17:32:10 -08:00
Leon Scroggins
86e1fa647f
Remove nativeCursorMatchesFocus, which is no longer necessary.
...
Bug:3335014
Requires a change in external/webkit.
Change-Id: I1dbaa73e86f312c6142c915e8cb252cf238f09c3
2011-01-10 17:28:02 -08:00
Joe Onorato
a85a91573a
add ComponentInfo.isEnabled()
...
Change-Id: I5ce59f62dc0ce3ce446bdbe397d1515e43031d76
2011-01-10 17:26:39 -08:00
Robert Greenwalt
7710465f38
am 55ccb887: Merge "Don\'t check for services before boot-complete" into honeycomb
...
* commit '55ccb8877549c539daa9b78d370452680045a77b':
Don't check for services before boot-complete
2011-01-10 17:15:16 -08:00
Adam Powell
f0ad6e6eaf
Fix bug 3333015 - Overflow menu item submenus do not open
...
Submenus of action bar menus will open as new menus.
Change-Id: I924b87bbea91b0df5e3608ec894530302c0e1d8d
2011-01-10 17:14:51 -08:00
Robert Greenwalt
55ccb88775
Merge "Don't check for services before boot-complete" into honeycomb
2011-01-10 17:13:24 -08:00
Jeff Brown
a3d4420b36
am f900fed8: Merge "Fix NPEs in detached views." into honeycomb
...
* commit 'f900fed8826ad41f8e280537262dea506d177382':
Fix NPEs in detached views.
2011-01-10 17:13:08 -08:00
Jeff Brown
f900fed882
Merge "Fix NPEs in detached views." into honeycomb
2011-01-10 17:11:34 -08:00
Robert Greenwalt
03b15b976c
Don't check for services before boot-complete
...
fixes the build
Change-Id: I2ee55d9aaad53dac16fa8182df3a7b43b57eb719
2011-01-10 17:09:25 -08:00
Jeff Brown
b3ea92235c
Fix NPEs in detached views.
...
Bug: 3297518
Change-Id: Ife1384f3a5bebbd28a29f97dc6d519f8a0b10ba9
2011-01-10 16:26:36 -08:00
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
Leon Scroggins
09eac425c2
Enable write ahead logging on databases used by WebView.
...
Bug:3337213
Change-Id: Ic687bc506faba23c3e52e44f0a5d0146a352206e
2011-01-10 17:23:53 -05: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