17128 Commits

Author SHA1 Message Date
Jeff Brown
976aaa75b8 am a3d4420b: am f900fed8: Merge "Fix NPEs in detached views." into honeycomb
* commit 'a3d4420b36dfd7bf54bc0a823182ec402785d0a5':
  Fix NPEs in detached views.
2011-01-10 18:05:27 -08:00
Mike Lockwood
09cfbaee60 am b0dbc1b5: am f9a04233: @hide android.permission.WRITE_MEDIA_STORAGE
* commit 'b0dbc1b5a6e423399bbab54b2af82136abca98ba':
  @hide android.permission.WRITE_MEDIA_STORAGE
2011-01-10 18:05:09 -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
Vasu Nori
83e29d9b3b am efd09ef4: am 3045bbaf: bug:3330569 print better message to help debug the problem
* commit 'efd09ef46d191b2a1decea32fa1de0a156ef7de6':
  bug:3330569 print better message to help debug the problem
2011-01-10 17:11:11 -08:00
Dmitri Plotnikov
8f9a8eb74f am 774cd32e: am 817b3f93: Fixing field description.
* commit '774cd32e0c8cefb8902049a288611a7718e65c6b':
  Fixing field description.
2011-01-10 17:11:02 -08:00
Huahui Wu
0a1fe58ee9 am ddf50607: 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 pres
* commit 'ddf50607d1a530c630a1ef96578afeb98028dae1':
  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 17:10:47 -08:00
Mike Lockwood
b0dbc1b5a6 am f9a04233: @hide android.permission.WRITE_MEDIA_STORAGE
* commit 'f9a04233c1db22a6ddd989b55db725badeae7539':
  @hide android.permission.WRITE_MEDIA_STORAGE
2011-01-10 17:02:42 -08:00
Mike Lockwood
f9a04233c1 @hide android.permission.WRITE_MEDIA_STORAGE
This permission is not needed for non-system or unbundled apps,
so we don't need it in the public API

Change-Id: I1a2a0349c6c5b7b5dc3104d69f4e39e95b878db9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-10 19:59:02 -05: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
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
463707189f am 67c796da: am 778f5f95: Merge "Make sure onCancelled() is called if cancel() is called early." into honeycomb
* commit '67c796da276d3d251f0ed19ecc44952a0b668f3c':
  Make sure onCancelled() is called if cancel() is called early.
2011-01-10 13:58:54 -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
5887c9459a am 48526d69: am eb97c0dd: Patch new JSON APIs with changes informed by GSON.
* commit '48526d6994c565ba223a02e45fea6faeeea6279c':
  Patch new JSON APIs with changes informed by GSON.
2011-01-10 13:01:44 -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
3e803355f5 am e79ea1db: am b3fbd7e0: Merge "Stop text selection mode when new text replaces selection." into honeycomb
* commit 'e79ea1dbc7731ba70b170fc0d74b48b1cf0b852d':
  Stop text selection mode when new text replaces selection.
2011-01-10 12:53:42 -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
Leon Scroggins
1fc6bc5477 am f5f13669: am e0b19124: Merge "Do not store the find callback until action mode starts." into honeycomb
* commit 'f5f13669bb5267e9cdfd581801ecee1540ab3971':
  Do not store the find callback until action mode starts.
2011-01-10 12:49:34 -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
e0b1912480 Merge "Do not store the find callback until action mode starts." into honeycomb 2011-01-10 12:41:20 -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
Subir Jhanb
c8cc63029b Merge "Making the sync manager take the data connected value from ConnectivityManager and not from the intent. BUG: 3337128 BUG: 3334394" 2011-01-10 12:21:34 -08:00
Subir Jhanb
753c57bf72 Making the sync manager take the data connected value from ConnectivityManager and not from the intent.
BUG: 3337128
BUG: 3334394

Change-Id: I75b88c7cc0be526e8e7e441aa2668307e2452e62
2011-01-10 12:18:11 -08:00
Andy McFadden
f214e29d95 am d0a4c69e: am 155b552b: Merge "Fix start-time setreuid complaints." into honeycomb
* commit 'd0a4c69e2ae28e4a9c13df25757c83493dd815b4':
  Fix start-time setreuid complaints.
2011-01-10 12:10:13 -08:00
Andy McFadden
d0a4c69e2a am 155b552b: Merge "Fix start-time setreuid complaints." into honeycomb
* commit '155b552b1d7b8ff705c325ee435022cc135f6486':
  Fix start-time setreuid complaints.
2011-01-10 12:08:43 -08:00
Andy McFadden
155b552b1d Merge "Fix start-time setreuid complaints." into honeycomb 2011-01-10 12:07:03 -08: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
Andy McFadden
05554a4ee9 Fix start-time setreuid complaints.
The code was checking errno instead of the return value from the call.
This fixes calls to setreuid(), setregid(), and setpgid().

Bug 3131052

Change-Id: I8b6155bd4fa9b941895b35fed62cfc163b420fff
2011-01-10 11:22:43 -08:00
Leon Scroggins
695172ef27 am 0efb38b4: am 9cac3c31: Remove the option to use shift to start selection mode.
* commit '0efb38b4790430e726ceee229d737cbc47cb067a':
  Remove the option to use shift to start selection mode.
2011-01-10 11:07:36 -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
8aa9966467 Merge "Do not display the IME when selection in non editable text." 2011-01-10 10:37:29 -08:00
Gilles Debunne
dcb70c7f54 Do not display the IME when selection in non editable text.
Change-Id: Ifce5aaa2de88eb6c428a82d12a8bbad4a350ae38
2011-01-10 10:36:02 -08:00
Gilles Debunne
33a9f9bd3a am 91736984: am 58f750ad: Merge "Fix for an NPE in Account settings on long press." into honeycomb
* commit '917369844f83604e528bee49ba042a2d1fe32509':
  Fix for an NPE in Account settings on long press.
2011-01-10 10:18:22 -08: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
5a173cb251 am 1613b5ba: am 4c894519: Merge "Fixing bug where StackView doesn\'t clip it\'s children correctly" into honeycomb
* commit '1613b5ba7bfe7cb89276b3bdbff8a492b892045f':
  Fixing bug where StackView doesn't clip it's children correctly
2011-01-10 10:11:11 -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