52554 Commits

Author SHA1 Message Date
John Wang
474c60cc38 am 1861225b: (-s ours) am fe682fd7: am cea03df2: Do not merge. Return null id for Non-phone device.
* commit '1861225be3c848fdf395f7aa815c673af4239011':
  Do not merge. Return null id for Non-phone device.
2011-06-09 11:56:28 -07:00
Jeff Brown
9429e6ebe4 am 92110af2: am 5f0b1721: am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2
* commit '92110af24a9a93b73264560b57f55f45ec65dab5':
  Fix swipe gesture cosine calculation. Bug: 4124987
2011-06-09 11:56:21 -07:00
James Dong
e3b80c8387 Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 2011-06-09 11:56:09 -07:00
Wink Saville
0231804095 am 0da86d4f: am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE
* commit '0da86d4fef70f94a02a504f8500df2833719da6b':
  Fix default preferred network.
2011-06-09 11:55:30 -07:00
Mike Lockwood
b3174c46ad UsbService: Fix JNI reference leak
http://code.google.com/p/android/issues/detail?id=17365

Change-Id: Ice0174e0db2a785d32ac16694ebf3b7ddb1b7fb3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-09 14:48:11 -04:00
Dave Santoro
1634542fa0 Merge "API modifications to handle profiles in Contacts." 2011-06-09 11:46:43 -07:00
Adam Powell
28285e176b Merge "Bug 4588114 - Make GestureDetector behave nicer with parallel multi-touch detection" 2011-06-09 11:43:19 -07:00
Marco Nelissen
6a91953cc9 am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds
* commit '90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f':
  Make sure we don't read from invalid fds
2011-06-09 11:41:57 -07:00
James Dong
3731e1bdf6 Correctly handle crop rect event in SoftAVC.cpp
Width and height of the video frame was incorrectly overwritten when a cropping need was detected. Using a separate
crop width and crop height resolves the problem.

Change-Id: I8a371c7fe7f8417a7995d7a7fe231120274ea0c8
related-to-bug: 4575591
2011-06-09 11:39:36 -07:00
Adam Powell
17921eefe3 Bug 4588114 - Make GestureDetector behave nicer with parallel multi-touch detection
Change-Id: I5ca377124a5888f0f45206d5de2d0a4b37e63351
2011-06-09 11:39:21 -07:00
Adam Powell
aaedf740a9 am 4e1504a6: am 7ed8ff18: am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
* commit '4e1504a66b37b424c8839e64f97ac823e5358bd5':
  Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector
2011-06-09 11:29:28 -07:00
Jake Hamby
0cf353e052 am 22165bb5: am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp
* commit '22165bb54af1cd3cb636c1d65da7c643d854c385':
  Fixes for SMS Cell Broadcast support.
2011-06-09 11:29:13 -07:00
John Wang
3fa5f37346 am 229d3a0c: am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE
* commit '229d3a0cbce70db82003705abf6844deec136d20':
  Make getDeviceId return null for Non-phone device.
2011-06-09 11:25:50 -07:00
Dianne Hackborn
1fdc061e99 am 816e5b72: am ee3de4a9: am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
* commit '816e5b72190787f2b6136925c172a00ebcbe4077':
  Remove compat mode dialog.
2011-06-09 11:24:32 -07:00
Dianne Hackborn
6a065874c3 am 891266e3: (-s ours) am b5b98f87: am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
* commit '891266e36e230fa0a4f4466672834a8e3e97598e':
  DO NOT MERGE. Experimental compatibility mode UI.
2011-06-09 11:23:10 -07:00
Stephen Hines
705d2ea63a Override equals()/hashCode() for RS BaseObj.
This will be used by slang reflection to type-check parameters to functions
that are of Allocation types (such as what happens with forEach).

BUG=4203264

Change-Id: I2ba94531bbf53becf7695b253e1faa3dff099894
2011-06-09 11:16:59 -07:00
Adam Powell
0e3c9ad31f Merge "Bug 4563099 - Action bar tabs - place second row tabs on top in the absence of home/up" 2011-06-09 11:14:41 -07:00
Conley Owens
d8b027b18f Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 2011-06-09 11:12:04 -07:00
Adam Powell
310849abb1 Bug 4563099 - Action bar tabs - place second row tabs on top in the
absence of home/up

Change-Id: I9d656962161f0cb26cecbc85991b347d2e951c76
2011-06-09 11:11:43 -07:00
John Reck
6d70fcf830 Merge "Don't cut velocity" 2011-06-09 11:07:54 -07:00
Dave Santoro
432513380e API modifications to handle profiles in Contacts.
The user's profile is represented as a single Contact, comprised of
Raw Contacts which may be contributed from any accounts the user has on the
system.

Two new permissions have been added: READ_PROFILE and WRITE_PROFILE.  These are
required for reading or writing any contact data that is designated as part of
the user's profile.

Contact queries can include the user's profile data by setting the
include_profile URI parameter to 1 (this requires READ_PROFILE access).  By
default, the user's profile data will not be included in any Contact queries.

Change-Id: I25616f59622dbb157032c9c435064eb36af6e8e1
2011-06-09 11:04:12 -07:00
Gilles Debunne
ed6741817a Text selection on phone
Exception on device rotation due to a removed test for existing selection.

onPreDraw is called for the PhoneWindow, updating container position, but before
the popup window is layout. Added a flag to force a new update after the layout.

Change-Id: I0f833c689a367ef76144230df28afa48db9ad950
2011-06-09 10:47:03 -07:00
Marco Nelissen
90dc22fa09 am a02d9bf9: Make sure we don\'t read from invalid fds
* commit 'a02d9bf9c3ff22cd449da21ff7c23170488ebd8e':
  Make sure we don't read from invalid fds
2011-06-09 10:36:24 -07:00
John Reck
7c272964c2 Don't cut velocity
Bug: 4545016

Change-Id: I0ebad82c1cc54c2e4e29f3827c3755edda9f47a5
2011-06-09 10:31:19 -07:00
Gilles Debunne
31bc2f9252 Merge "Add SwitchPreference" 2011-06-09 10:25:25 -07:00
Jeff Sharkey
760145e3af Merge "Persist network stats using AtomicFile." 2011-06-09 10:22:27 -07:00
Justin Ho
9b0a8f9a92 am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
* commit '1d3173c3dc93bb4f2efc5b059fec8e7577b3258a':
  Updating default wallpaper of large devices to match xlarge
2011-06-09 10:22:17 -07:00
Xavier Ducrohet
2e0f711817 am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* commit '8ee28811ad208d224ac8d317e4644aabc9ffb886':
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
2011-06-09 10:19:14 -07:00
Justin Ho
1d3173c3dc Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 2011-06-09 10:18:13 -07:00
Steve Block
430ad47334 Merge "Fixes WebView.loadData() to avoid constructing invalid URLs." 2011-06-09 10:16:29 -07:00
Jeff Sharkey
3f3913550c Persist network stats using AtomicFile.
Implements read/write of network stats using AtomicFile, along with
magic number and versioning.  Stores in "/data/system/netstats.bin"
for now.  Tests to verify that stats are persisted across a simulated
reboot, and to verify that TEMPLATE_WIFI is working.

Fixed bug where kernel counters rolling backwards would cause negative
stats to be recorded; now we clamp deltas at 0.

Change-Id: I53bce26fc8fd3f4ab1e34ce135d302edfa34db34
2011-06-09 10:14:13 -07:00
Narayan Kamath
6362e96d32 Merge "Implement QUEUE_FLUSH and QUEUE_DESTROY addition modes." 2011-06-09 10:13:47 -07:00
Xavier Ducrohet
8ee28811ad Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* changes:
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
2011-06-09 10:12:40 -07:00
Chet Haase
af741bf95b Merge "Change exception thrown when set() called on readonly Property." 2011-06-09 10:12:04 -07:00
Philip Milne
4233bc8968 Merge "Fix for baseline alignment in LinearLayout compatibiity mode." 2011-06-09 10:10:26 -07:00
Philip Milne
7fd9487569 Fix for baseline alignment in LinearLayout compatibiity mode.
Change-Id: Iaa194537c1bc493172fab89624279fe5cbfa1f70
2011-06-09 09:54:01 -07:00
Alex Sakhartchouk
2246fb3198 Merge "More work to make libRS buildable on the host." 2011-06-09 09:42:28 -07:00
Justin Ho
3116496837 Updating default wallpaper of large devices to match xlarge
Change-Id: I3fbcefce70e862fdc8e332f919485f1ec904a1b1
2011-06-09 09:42:22 -07:00
Marco Nelissen
a02d9bf9c3 Make sure we don't read from invalid fds
b/4580570

Change-Id: I622f001551a404a7a840d8388a9febac2db107ad
2011-06-09 09:39:52 -07:00
Xavier Ducrohet
f24ed1c272 am 3eb9f832: (-s ours) am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread
* commit '3eb9f8326e6d72be671bf0226965ca3231a25d7d':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.
2011-06-09 09:04:38 -07:00
Xavier Ducrohet
78714c1edf am e1d14a29: (-s ours) am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread
* commit 'e1d14a29ff9aa17923dc4e9406408cbc07a97c31':
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.
2011-06-09 09:04:26 -07:00
Romain Guy
0fbf20703f am 34e9f249: am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
* commit '34e9f249a9b36ebe64476b997bca0edf990fbc0d':
  Disable plugins if setPluginsEnabled(false) called.
2011-06-09 09:03:55 -07:00
Narayan Kamath
4924fe3867 Implement QUEUE_FLUSH and QUEUE_DESTROY addition modes.
Note that this change is slightly more flexible, it defines
a priority for each playback request. We needn't really throw
away synthesis requests from other apps. We could just play
them after higher priority ones (for e.g from talkback).

Change-Id: I6c7dd9abe4871e87da08d9aaa4c55225a69078e5
2011-06-09 16:42:16 +01:00
Chet Haase
accb54c52f Change exception thrown when set() called on readonly Property.
Change-Id: I2669e32691c93dfaf07c34ca4d9fe5c6d47d5480
2011-06-09 08:38:12 -07:00
Martijn Coenen
604d7fe799 Merge "Added support for rediscovering a Tag (API)." 2011-06-09 08:01:25 -07:00
Andy McFadden
8fdb1e601e Merge "Add a URI for recurring event exceptions" 2011-06-09 07:37:07 -07:00
Brian Carlstrom
a14775949c Implement android.webkit.BrowserFrame.requestClientCert
Following the example of reportSslCertError, implement requestClientCert

ERROR CASE                                              CLIENT CERT CASE
<... From external/webkit ...>                          <... From external/webkit ...>
android.webkit.BrowserFrame.reportSslCertError          android.webkit.BrowserFrame.requestClientCert
CallbackProxy.onReceivedSslError                        CallbackProxy.onReceivedClientCertRequest
WebViewClient.onReceivedSslError                        WebViewClient.onReceivedClientCertRequest
<... See packages/apps/Browser ...>                     <... See packages/apps/Browser ...>
SslErrorHandler.proceed (with SslCertLookupTable)       ClientCertRequestHandler.proceed (with SslClientCertLookupTable)
android.webkit.BrowserFrame.nativeSslCertErrorProceed   android.webkit.BrowserFrame.nativeSslClientCert
<... To external/webkit ...>                            <... To external/webkit ...>

Change-Id: I2ba6007ad9b2ee520a0a6b17f3a767679b1664de
2011-06-09 05:01:56 -07:00
Narayan Kamath
6276814a67 Merge "Make changes to the TTS api suggested by the API review." 2011-06-09 04:09:22 -07:00
Steve Block
f95d490b78 Fixes WebView.loadData() to avoid constructing invalid URLs.
Also updates the documentation to make clear how the encoding parameter should be used.

Bug:4541798
Change-Id: I9283513fbd8bcc3dc54056cfa2d0ab2425681824
2011-06-09 12:03:36 +01:00
Steve Block
21ac7a84fc Merge "Fix some poorly worded API documentation for WebView.loadDataWithBaseURL()" 2011-06-09 03:48:41 -07:00