22512 Commits

Author SHA1 Message Date
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
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
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
Daisuke Miyakawa
63b709d9c6 Add return value spec and fix typo.
Bug: 4371572
Change-Id: I4906a8f337dee855ef753e65eb69bdb02b1a0d72
2011-06-09 13:56:16 -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
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
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
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
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
Steve Block
ae32857ebd Fix some poorly worded API documentation for WebView.loadDataWithBaseURL()
See https://mondrian.corp.google.com/changelist/110819-p9

Change-Id: I35fc65752687322ddfec39f5e2d7e5e5b89951e7
2011-06-09 11:27:48 +01:00
Jake Hamby
d4f1bacca5 resolved conflicts for merge of 7ca13deb to master
Change-Id: If34814d6c70cf63eca9bd816845389f6785518ae
2011-06-08 23:20:09 -07:00
Daisuke Miyakawa
9b3811b685 Merge "Introduces new Contacts API for ranking promotion." 2011-06-08 19:55:47 -07:00
Daisuke Miyakawa
b2b651f16d Introduces new Contacts API for ranking promotion.
The usage feedback will be used for achieving per-method
(email address, phone number) ranking improvement.

Bug: 4371572
Change-Id: I602c0b83afca674904946f59bbdfc4dca07d46e4
2011-06-08 19:53:55 -07:00
Svetoslav Ganov
34803caec8 Merge "AccessibilityNodeInfo and AccessibilityEvent to initialized properly." 2011-06-08 19:44:20 -07:00