16777 Commits

Author SHA1 Message Date
Brian Carlstrom
42f6528b98 New KeyChain API for application access to keystore credentials
The KeyChain API is Currently in use by Browser and validated by Email
for client certificate authentication.

Change-Id: Ifeab416be594457a05747406e31656e71795cb53
2011-06-10 10:43:02 -07:00
satok
21e2f1b4a0 Merge "API to set additional subtypes" 2011-06-10 00:26:52 -07:00
satok
e7c6998e0a API to set additional subtypes
Bug: 4321667

- Due to the voice team's strong request

Change-Id: Ia8bbc277c0987bde996e6f65541877cec96a3ca1
2011-06-10 15:26:03 +09:00
Dianne Hackborn
7bbf6f7d11 am 8297f669: am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
* commit '8297f669356ee997c5faa745815e8b9a7009fba7':
  Fix for not reporting correct "sw" in compat mode.
2011-06-09 18:42:55 -07:00
Dianne Hackborn
e6b03d0979 resolved conflicts for merge of 9dfd7d0a to master
Change-Id: I9fbee3209b7fe5c7b5b42b62309eb60dc49bf9e2
2011-06-09 18:39:37 -07:00
Dianne Hackborn
a47847fc50 Merge "resolved conflicts for merge of e2aa0490 to master" 2011-06-09 18:00:13 -07:00
Romain Guy
8af7f5f8e4 Merge "Add a way to measure potential framerate of the view hierarchy." 2011-06-09 17:50:51 -07:00
Dianne Hackborn
f741e679c4 resolved conflicts for merge of e2aa0490 to master
Change-Id: Id0448a1598fc93aca0652b29253e02586e35a067
2011-06-09 17:50:36 -07:00
Romain Guy
59a12cae20 Add a way to measure potential framerate of the view hierarchy.
Change-Id: Ia19c7ed143d8a823fd678ffab84613ea075d228a
2011-06-09 17:48:21 -07:00
Gilles Debunne
aab49b40e8 Merge "Text selection on phone" 2011-06-09 16:56:31 -07:00
Shimeng (Simon) Wang
52a31da29f Merge "Consider default zoom scale for mobile viewport." 2011-06-09 16:41:18 -07:00
Daisuke Miyakawa
92a1af5498 Merge "Add return value spec and fix typo." 2011-06-09 16:34:10 -07:00
Andy McFadden
e1a255a89f Merge "Use public constants" 2011-06-09 16:08:16 -07:00
Fabrice Di Meglio
5f3b2f1e59 Merge "Add Configuration.getLayoutDirectionFromLocale()" 2011-06-09 16:08:00 -07:00
Shimeng (Simon) Wang
82a077043f Consider default zoom scale for mobile viewport.
issue: 4482888
Change-Id: I6a100700b7a7e9464b397f219217225f3ada0f63
2011-06-09 16:02:34 -07:00
Fabrice Di Meglio
7194efd394 Add Configuration.getLayoutDirectionFromLocale()
- returns LAYOUT_DIRECTION_UNDEFINED / LAYOUT_DIRECTION_LTR / LAYOUT_DIRECTION_RTL depending on the Locale
- add unit tests

Change-Id: I4372734eb011cbf6270f39ba815e696b04f2352f
2011-06-09 16:00:28 -07:00
Shimeng (Simon) Wang
b924ab5bda Merge "Fix height measure state." 2011-06-09 15:56:19 -07:00
Svetoslav Ganov
601ad8061c Invalid access to AccessibilityInteractionController
1. The Interaction connection checks if the ViewAncestor
   is valid and posts a message to be processed on the UI
   thread. The code in the UI thread did not check if
   the mView was valid. Added this check.

2. Added a faster sync mechanism in the test for
   getting the source of the last access event.

Change-Id: I9982b6592f5f44a68a67df40f37c063a3ba62993
2011-06-09 15:44:24 -07:00
Andy McFadden
6f5b455045 Use public constants
Some of the internal doc references were using non-public ways to
get at constants.

Bug 4575374

Change-Id: I4884d8db964950d92b3f26634724b201674bea8c
2011-06-09 15:43:59 -07:00
Shimeng (Simon) Wang
e7c2ee75e9 Fix height measure state.
issue: 4257815
Change-Id: I6fc164767f805cfd13cf31707f3d53aa2714f9fc
2011-06-09 15:11:25 -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
Daisuke Miyakawa
63b709d9c6 Add return value spec and fix typo.
Bug: 4371572
Change-Id: I4906a8f337dee855ef753e65eb69bdb02b1a0d72
2011-06-09 13:56:16 -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
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
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
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
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
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