22643 Commits

Author SHA1 Message Date
Justin Ho
3116496837 Updating default wallpaper of large devices to match xlarge
Change-Id: I3fbcefce70e862fdc8e332f919485f1ec904a1b1
2011-06-09 09:42:22 -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
Dianne Hackborn
8297f66935 am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
* commit '3aabdeaceff8405406d90c329a6691552559556d':
  Fix for not reporting correct "sw" in compat mode.
2011-06-08 22:38:03 -07:00
Dianne Hackborn
3aabdeacef am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
* commit '5ba2e872fa684c0f1b992a95df00854b58f2cd8c':
  Fix for not reporting correct "sw" in compat mode.
2011-06-08 22:35:25 -07:00
Dianne Hackborn
5ba2e872fa Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 2011-06-08 22:33:34 -07:00
Dianne Hackborn
48a7651823 Fix for not reporting correct "sw" in compat mode.
Change-Id: Ia225c94b36ccc3589d417aafd5680247678eddfd
2011-06-08 22:26:33 -07:00
Dianne Hackborn
9dfd7d0a47 am 2d618e41: am e22fe933: Fix issue #4582417: Need to add new PackageManager...
* commit '2d618e415fa0ed8a1e7ac8d0ffe98cebdf6c208b':
  Fix issue #4582417: Need to add new PackageManager...
2011-06-08 21:41:55 -07:00
Dianne Hackborn
2d618e415f am e22fe933: Fix issue #4582417: Need to add new PackageManager...
* commit 'e22fe9331ad8a9f81470751fdeca7633f654cffa':
  Fix issue #4582417: Need to add new PackageManager...
2011-06-08 21:38:33 -07:00
John Wang
4d04204824 am 08a8f3f9: Merge "Set emergency call text visibility." into honeycomb-LTE
* commit '08a8f3f9dc035bc462061ae87090a8da59c6713a':
  Set emergency call text visibility.
2011-06-08 20:41:41 -07:00
John Wang
08a8f3f9dc Merge "Set emergency call text visibility." into honeycomb-LTE 2011-06-08 20:38:59 -07:00
Dianne Hackborn
e22fe9331a Fix issue #4582417: Need to add new PackageManager...
...FEATURE_ constant for FAKE_MULTITOUCH in MR2

Change-Id: Ib6950d9dbdd58618aec593de7e0cf1c01b7d6ef9
2011-06-08 20:38:41 -07:00
Dianne Hackborn
e2aa04908c am a1396dfe: am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2
* commit 'a1396dfe7ad6ec6953f544be42d69d7804ab0fd4':
  Work on issue #4518815: Compatibility mode introduces compatibility regression...
2011-06-08 20:06:40 -07:00
Dianne Hackborn
a1396dfe7a am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2
* commit '021408910af170268cb486910d4dd5a7d838c2bb':
  Work on issue #4518815: Compatibility mode introduces compatibility regression...
2011-06-08 20:02:43 -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
John Wang
5328bf0b2e Set emergency call text visibility.
Set emergency call text visibility based on
emergencyCallCapable config for sim missing
and networklock screens.

bug:4392059
Change-Id: Ibfe92405ada7b452927940295c090d88ecd79519
2011-06-08 19:51:57 -07:00
Svetoslav Ganov
34803caec8 Merge "AccessibilityNodeInfo and AccessibilityEvent to initialized properly." 2011-06-08 19:44:20 -07:00
Svetoslav Ganov
9210ccbdc3 AccessibilityNodeInfo and AccessibilityEvent to initialized properly.
Change-Id: Id3a1b33a222790214820af4a8b49378f08e53558
2011-06-08 19:42:59 -07:00
John Wang
3948a2b420 am 735463d1: Merge "Fix layout issue on Xoom when device thinks there\'s a SIM." into honeycomb-LTE
* commit '735463d1d9a1e490fa6b30d4273d24fc2f12bcd9':
  Fix layout issue on Xoom when device thinks there's a SIM.
2011-06-08 19:41:39 -07:00
John Wang
735463d1d9 Merge "Fix layout issue on Xoom when device thinks there's a SIM." into honeycomb-LTE 2011-06-08 19:37:56 -07:00
Jim Miller
b0cdc2baa5 Fix layout issue on Xoom when device thinks there's a SIM.
bug:4411799
Change-Id: I2c7deff557bcd226444730401c8347ea3d6cab56
2011-06-08 18:48:58 -07:00
Dianne Hackborn
5fd2169eab Work on issue #4518815: Compatibility mode introduces compatibility regression...
...for Market App iRunner

There were a lot of serious issues with how we updated (or often didn't update)
the display and resource state when switching compatibility mode in conjunction
with restarting and updating application components.  This addresses everything
I could find.

Unfortunately it does *not* fix this particular app.  I am starting to think this
is just an issue in the app.  This change does fix a number of other problems
I could repro, such as switching the compatibility mode of an IME.

Also a few changes here and there to get rid of $#*&^!! debug logs.

Change-Id: Ib15572eac9ec93b4b9966ddcbbc830ce9dec1317
2011-06-08 18:45:43 -07:00
Adam Powell
be0a453505 Add SwitchPreference
Change-Id: I073e9bfba8c4e1a625c27f976f71ea56a81ba20f
2011-06-08 18:25:27 -07:00
John Reck
2db439bdd8 Merge "Fix initial zoom with loadViewState" 2011-06-08 18:19:12 -07:00
John Reck
60c84d67c5 Fix initial zoom with loadViewState
Change-Id: I06ee6a44c6e102ed84b44c68a83ab7db29d9f160
2011-06-08 18:00:02 -07:00
Adam Powell
fb339016ff am 73d54e7b: am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2
* commit '73d54e7b54f95401ad290bf9d305cad449db7ae3':
  Public styles for action bar tabs
2011-06-08 17:16:16 -07:00
Martijn Coenen
e5141eef50 am 4c5f2a9d: am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records.
* commit '4c5f2a9dd26674be797e1cb7c995247601096a04':
  Prevent allocation overflows by corrupt NDEF records.
2011-06-08 17:03:05 -07:00
Jeff Brown
0a2f6640de Make orientation changes happen sooner.
Tweaked the window orientation listener to be less conservative
in its filtering.  Should shave a couple hundred milliseconds
off the rotation time.

Change-Id: If7dd5114b0941df6199fe81080ac94730cf797cf
2011-06-08 16:58:59 -07:00
Adam Powell
73d54e7b54 am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2
* commit '4381f6421ca408d1dc66430ddfb107c5011bfe25':
  Public styles for action bar tabs
2011-06-08 16:58:35 -07:00
Romain Guy
66e9af6c54 Remove obsolete code.
Change-Id: I2f990528bdc0dc6127f367e55c55287d43dd29f9
2011-06-08 16:09:28 -07:00
Adam Powell
1a4678b93f Public styles for action bar tabs
Change-Id: Id77d32c6d83ea72662ae8972710860f5fe42e617
2011-06-08 15:13:50 -07:00
Andy McFadden
4a8c478dfa Add a URI for recurring event exceptions
Part of a larger Calendar provider change.

Bug 4473786

Change-Id: I0cb4260ea590da0c48b55d0ca3ee586e00d37b36
2011-06-08 14:59:51 -07:00
John Wang
de13001f76 am 1f866589: am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE
* commit '1f8665895f71904b9d757854277cb637841356c3':
  Add SIM PUK unlockscreen.
2011-06-08 14:46:04 -07:00
Martijn Coenen
2dcae567ab Added support for rediscovering a Tag (API).
Bug: 3378764
Change-Id: I4697b814337270c4458ca2b8ce358de315904777
2011-06-08 23:26:42 +02:00
Chia-chi Yeh
ff3bdca31f The service part of the user space VPN support.
The dialogs will be in another change.

Change-Id: I0cdfd2ef21ffd40ee955b3cbde5ada65dbfdb0bc
2011-06-08 14:16:42 -07:00
Nick Pelly
9eb5847777 Merge "Move NDEF URI helper method into android.nfc.NfcRecord" 2011-06-08 13:44:28 -07:00
Chet Haase
b19fcf3e9c Merge "Add 'Property' object" 2011-06-08 12:51:06 -07:00
Nick Pelly
e0180d053e Move NDEF URI helper method into android.nfc.NfcRecord
Change-Id: Ia044e45cbe2cd06c4844d15a57f1c1f392cf65cd
2011-06-08 11:26:11 -07:00
Martijn Coenen
608a23a07e Merge "Implement Felica timeout handling (API)." 2011-06-08 11:04:36 -07:00
Martijn Coenen
a924973f22 Implement Felica timeout handling (API).
Allows controlling the timeout for transceive on Felica.

Change-Id: I5c62b3ea0e8a16bc006feac6ec759cdb730bc938
2011-06-08 20:00:02 +02:00