Teng-Hui Zhu
4e6c1da41c
am 5a9bbc34: am b5141a9f: am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2
...
* commit '5a9bbc34cb2a83188b7407c4f7bae47e40593c34':
fix one NPE when webChromeClient don't have progress view support
2011-06-10 15:21:26 -07:00
John Reck
b0e81da4b8
Merge "Tweak snap settings"
2011-06-10 14:57:33 -07:00
John Reck
75738725e7
Tweak snap settings
...
Different settings for horiz vs. vert snap
Snap angle increase in snap mode
Change-Id: I105e79b0c6fae239beef0c311cddd748def2ad8b
2011-06-10 14:51:53 -07:00
Teng-Hui Zhu
5a9bbc34cb
am b5141a9f: am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2
...
* commit 'b5141a9fc7e841167c3e07f8797d8aef9a787d25':
fix one NPE when webChromeClient don't have progress view support
2011-06-10 14:27:13 -07:00
Teng-Hui Zhu
b5141a9fc7
am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2
...
* commit '90bdb69bf95e5865547a55260dd61744b0bcc911':
fix one NPE when webChromeClient don't have progress view support
2011-06-10 14:22:52 -07:00
Shimeng (Simon) Wang
a8ed4ad80d
Merge "Fix reflow for mobile sites."
2011-06-10 14:13:36 -07:00
Brian Carlstrom
3b765f0462
Merge "New KeyChain API for application access to keystore credentials"
2011-06-10 14:11:15 -07:00
Nick Pelly
e14674d515
Merge "NfcAdapter: Remove dead AIDL methods."
2011-06-10 13:55:36 -07:00
Shimeng (Simon) Wang
e86cdeb86c
Fix reflow for mobile sites.
...
1. use correct mDefaultScale instead of 1.0f.
2. ignore mMinZoomScaleFixed in case of using wide viewport since
sometimes mobile site will impose a min scale while the web content
will make it bigger than overview scale.
issue: 4257815
Change-Id: Ib4ca9b4dab8585827081a32432076eeeaedecd38
2011-06-10 13:42:32 -07:00
John Reck
60f36a52ac
Merge "Expose hook for crash backup"
2011-06-10 13:10:52 -07:00
Dianne Hackborn
32ed8448d2
Merge "resolved conflicts for merge of f51ded0f to master"
2011-06-10 12:47:12 -07:00
Dianne Hackborn
6b592723c9
resolved conflicts for merge of f51ded0f to master
...
Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2
2011-06-10 12:45:36 -07:00
Svetoslav Ganov
8dffad68c7
Bug fixes in the accessibility interrogation APIs
...
1. AccessibilityNodeInfo was not overriding equals.
2. ViewAncestor was not calling the callback for
setting the result of an interrogation request
thus making the system process wait upto the
maximal timeout.
Change-Id: I040a3c12d97f48aee319ba6414879546e71e9b8e
2011-06-10 12:43:00 -07:00
Philip Milne
08b992c88e
Merge "Optimise the way that indices are auto-allocated so that XML files can normally avoid using indices."
2011-06-10 11:54:39 -07:00
RoboErik
a2aee84eee
Merge "Upgrade of Calendar db to 305"
2011-06-10 11:36:15 -07:00
Nick Pelly
c17a7a57d7
NfcAdapter: Remove dead AIDL methods.
...
Change-Id: Ia848c86dffcbe9f661d63fab6b32af41bbd8ee81
2011-06-10 11:36:13 -07:00
RoboErik
9734df5f0c
Upgrade of Calendar db to 305
...
Name changes for db upgrade and reorganization for easier
referencing of calendar/event columns.
Change-Id: Ic892729e1fa11c7971d99ec17d930db9300d44e9
2011-06-10 10:58:31 -07:00
Chet Haase
ec609d3a36
Merge "Change Property.set() to throw UnsupportedOperationException by default"
2011-06-10 10:58:26 -07:00
Teng-Hui Zhu
2302fe5226
fix one NPE when webChromeClient don't have progress view support
...
Change-Id: I5a88365f216d5dea38ab2eac9562d26b00a2d617
2011-06-10 10:56:33 -07:00
Philip Milne
f474870fe1
Optimise the way that indices are auto-allocated so that XML files can normally avoid using indices.
...
Change-Id: Iafb25b17fec9391664c81a7e213eeaa918254912
2011-06-10 10:51:45 -07:00
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
Chet Haase
a2f78a3617
Change Property.set() to throw UnsupportedOperationException by default
...
Change-Id: I2326e066e0b7ce63cbafe83a3a37b90a3d148c43
2011-06-10 10:07:59 -07:00
Ben Komalo
2447edd85b
New device policy to disable camera.
...
This introduces a new policy that a DeviceAdmin can use to disable _all_
cameras on the device. A separate CL will be made on the media side to
watch this policy bit and act accordingly.
Bug: 4185303
Change-Id: I700cfc4a8317bb74087ccae39346d74467fc58b2
2011-06-10 09:37:17 -07:00
Narayan Kamath
d3ee2fa184
Refactor some of TextToSpeech
...
required to let the Settings code to the same logic
and not have to roll it's own.
Change-Id: I2766b8562c940182a2954555fb1854889c3ac91a
2011-06-10 16:33:28 +01:00
Narayan Kamath
a5084e6389
Merge "Don't hardcode the default engine."
2011-06-10 07:53:56 -07:00
Narayan Kamath
22302fb7ba
Don't hardcode the default engine.
...
One point to note is that no TTS engine will be selected
by default if there are no system TTS engines.
Change-Id: I397061e3cf29b8a1c66e7864262b43621ef5100d
2011-06-10 15:29:06 +01:00
Narayan Kamath
f13874ffe6
Merge "Some TTS fixes."
2011-06-10 06:23:17 -07:00
Narayan Kamath
abc63fbdda
Some TTS fixes.
...
(a) Document the undocumented queue mode (mode == 2)
(b) intern strings to fix a bug in removeCallbacksAndMessages
(c) remove an unnecessarly lock object, change the field it
guarded to volatile.
Change-Id: If46bbfe2afb047b3ba5b3cb9a90c292656379ec1
2011-06-10 13:01:46 +01:00
Debashish Chatterjee
64c99171e8
Merge "Voicemail provider contract definition."
2011-06-10 04:42:32 -07:00
Debashish Chatterjee
489d2d546a
Merge "Voicemail related fields in calllog provider."
2011-06-10 04:38:07 -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
John Reck
4bfd6f0fe5
Expose hook for crash backup
...
Allows browser to know when to update the crash state in response
to a textfield's contents changing
Change-Id: Idda7a2931f4c9ae01418b91bbabb1e237f118664
2011-06-09 17:45:28 -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
Dianne Hackborn
f51ded0f8f
am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
...
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
Enforce public resource restriction on bag parents.
2011-06-09 16:06:07 -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
Dianne Hackborn
a8d7ea067c
am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
...
* commit '220cd77de62956eb76c5084e1d1341d69bfd214a':
Enforce public resource restriction on bag parents.
2011-06-09 16:02:02 -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