52378 Commits

Author SHA1 Message Date
Jamie Gennis
eadfb673e7 SurfaceTexture: fix a getTransformMatrix crash.
This change moves the computation of the transform matrix out of
getTransformMatrix and instead performs the computation when
updateTexImage gets called.  This is needed in order for
getTransformMatrix to succeed even if the buffers have been freed (e.g.
by changing the buffer count) because the computation depends upon the
properties of the current GraphicBuffer.

Change-Id: Ied541ab8747b7ad604f862717135f9a16a816be9
Bug: 4490420
2011-06-13 10:50:12 -07:00
Adam Powell
fe93010446 Merge "Fix bug 4501881 - use correct TextAppearances for global actions" 2011-06-09 14:34:45 -07:00
Adam Powell
cbe7c3c20f Fix bug 4501881 - use correct TextAppearances for global actions
Change-Id: Ie3751b92d145dd26d5211383982186af11c67b94
2011-06-09 14:33:33 -07:00
Shimeng (Simon) Wang
d169d3cb65 Merge "Better handle double tap for smooth reflow and zoom." 2011-06-09 14:10:54 -07:00
Andy McFadden
5732bf6cab Merge "Move CalendarUtils into Calendar app" 2011-06-09 14:07:04 -07:00
John Wang
ec87aca649 am 3948a2b4: am 735463d1: Merge "Fix layout issue on Xoom when device thinks there\'s a SIM." into honeycomb-LTE
* commit '3948a2b4205c36bc1b4a3911753d970248480742':
  Fix layout issue on Xoom when device thinks there's a SIM.
2011-06-09 13:55:20 -07:00
Mathias Agopian
880b2df55c am 96fcb702: am b40e85f9: am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2
* commit '96fcb702d75dcfb36c3ebd8fe420c8b29fa67fb7':
  Fix a leak in RefBase
2011-06-09 13:54:54 -07:00
Shimeng (Simon) Wang
136c20b88e Better handle double tap for smooth reflow and zoom.
In case it's the first time to reflow or the page is in zoom overview
mode, let the reflow and zoom happen at the same time to avoid the
need of double tapping twice.

Also fix the viewport width to webview's original width for mobile
site.

issue: 4482888
Change-Id: Ic7c73a9eb3f75fd68322f7f4da14141126e75ad8
2011-06-09 13:51:55 -07:00
Adam Powell
7b75ee78c8 Merge "resolved conflicts for merge of fb339016 to master" 2011-06-09 13:16:50 -07:00
Andy McFadden
271c3aee1f Move CalendarUtils into Calendar app
Bug 4575374

Change-Id: I325810002c63a82e712d7505327e77c388564d2c
2011-06-09 13:14:34 -07:00
Brian Carlstrom
d496da46a8 Merge "Implement android.webkit.BrowserFrame.requestClientCert" 2011-06-09 12:36:54 -07:00
Adam Powell
0419ab9e4a resolved conflicts for merge of fb339016 to master
Change-Id: I4ffa0bb8809fa5f99feced9e243df4efa6ac00ac
2011-06-09 12:15:10 -07:00
Wink Saville
599b102997 am 2d8500d2: am 799f04c0: Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE
* commit '2d8500d21a3fe6af36040a5dcd0599e00a242766':
  Report data status from ApnContext even if data is detached
2011-06-09 11:58:28 -07:00
Wink Saville
62bd659a09 am a384ff32: am 33e1424b: Merge "Use CSIM to get provision information" into honeycomb-LTE
* commit 'a384ff32827cf6383ead48ec4e0da42365ed3584':
  Use CSIM to get provision information
2011-06-09 11:58:16 -07:00
Jean-Baptiste Queru
f1ff931594 am ed17165a: am 0315a2c5: (-s ours) am f3894a04: Merge "Tweak setViewport stuff for fwd-compat"
* commit 'ed17165a14e20ab5110be8c86ec1b519835613d0':
  Tweak setViewport stuff for fwd-compat
2011-06-09 11:56:34 -07:00
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
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
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
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
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
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
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
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
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
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