destradaa
ba3ef85d14
am 4ec6c891: am e2383800: am 607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev
...
* commit '4ec6c891748475f35966a612abad18a03ddae88a':
Fix exceptions in ActivityRecognition platform stack.
2014-07-17 23:54:30 +00:00
Andres Morales
67700b288a
am 6108899c: am 77bf359b: am e9f27df7: Permit settings to "wipe" the persistent partition
...
* commit '6108899c4b03dc08f58df858d670b1de187bfe71':
Permit settings to "wipe" the persistent partition
2014-07-17 23:54:21 +00:00
Zhijun He
96da0ae9c7
am 5cb48006: am 3bce0759: am 4c6f6ffe: Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev
...
* commit '5cb480063294ca1f721240465e4e1f92bf1e4a71':
Camera2: replace partial quirks with normal partial result
2014-07-17 23:54:17 +00:00
Eino-Ville Talvala
ef33384939
am 9971ee27: am 7e6dd457: am 97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev
...
* commit '9971ee27026b799f7e09fabd53ba07c5b43bfd93':
Add PackageManager features for differentiating camera2 devices
2014-07-17 21:06:22 +00:00
Chris Craik
a4ca835624
am a383d6e3: am deec48ed: am 19f0c01c: Merge "Simplify ViewRootImpl\'s AttachInfo usage" into lmp-dev
...
* commit 'a383d6e3a23cb97b5102a75b6ac9010ee170cb43':
Simplify ViewRootImpl's AttachInfo usage
2014-07-17 21:06:10 +00:00
Amith Yamasani
68265b0740
am 840e1535: am 562b7f0d: am 56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev
...
* commit '840e1535b9e607be177241552a08ac2b1cb236d6':
Split telephony restrictions into outgoing calls and sms
2014-07-17 21:06:05 +00:00
Adam Powell
f8c8fc4c27
am 702f8297: am 35b4be8b: am 21b1b8b9: Add nested pre-fling for nested scrolling
...
* commit '702f82972600b6b78d5fee1d2511488ad405a1b1':
Add nested pre-fling for nested scrolling
2014-07-17 21:06:00 +00:00
Ruben Brunk
f89631e1d8
am b66e3aae: am ff8ea9c5: am 0a749af3: Merge "camera2: Fix swapped Face detection commands." into lmp-dev
...
* commit 'b66e3aae34e2ad9a5a6b9b5904f1ca4ebc101a73':
camera2: Fix swapped Face detection commands.
2014-07-17 21:05:47 +00:00
Christopher Tate
4cbb4469e6
am 0c3679f4: am 5763ad39: am e78826f6: Add BackupAgent.onRestoreFinished() callback
...
* commit '0c3679f423006976766c8eafbc78d7c3702990d5':
Add BackupAgent.onRestoreFinished() callback
2014-07-17 21:05:25 +00:00
Adam Connors
fd259886cd
am 23439bb9: am bab7ceaf: am d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev
...
* commit '23439bb9f3edcd2191aff79d57018ddaf2d74847':
Create DPM APIs for cross profile callerId
2014-07-17 21:05:08 +00:00
Martin Kosiba
9ab6dbc624
am 6239ed0c: am fbb2246c: am 92486999: Allow for appending of resources to an AssetManager.
...
* commit '6239ed0c67b2e981e80e9eac29d9aecd01a99cda':
Allow for appending of resources to an AssetManager.
2014-07-17 21:04:53 +00:00
Alexandra Gherghina
55144e0e21
am ea887ed3: am 14b5a9b4: am dbfd0744: Ads per-user APIs to manage accounts through the AccountManager
...
* commit 'ea887ed3d19f744c83effb13347bc0a69e75f005':
Ads per-user APIs to manage accounts through the AccountManager
2014-07-17 21:04:49 +00:00
Andres Morales
963295ea10
Permit settings to "wipe" the persistent partition
...
One of the requirements is that when the user does a
factory reset through settings, all data on the
persistent partition should be cleared.
This adds one last API method that allows settings
to wipe the partition.
Bug: 14288780
Change-Id: Ib87ee741d1e5195814516ae1d66eb7c4cf754dcf
2014-07-17 20:42:04 +00:00
Adam Powell
b72be59a6a
Add nested pre-fling for nested scrolling
...
Nested pre-fling allows a nested scrolling parent to consume a fling
operation before the child view does. If a parent has been consuming
nested pre-scroll events in a particular direction, this is generally
a good indication that it should also consume the resulting fling at
the end.
Bug 15538504
Change-Id: I88e8753a96c9b41815c3be530cafab8345164e64
2014-07-17 11:37:59 -07:00
Julia Reynolds
7a387c5dac
am 6a1230cf: am d7dd3073: am 9c9cb566: Merge "Update message on DISALLOW_REMOVE_USERS constant." into lmp-dev
...
* commit '6a1230cfcc8f6c9920d06e6ac2ec8dcf39903cf2':
Update message on DISALLOW_REMOVE_USERS constant.
2014-07-17 18:29:16 +00:00
Torne (Richard Coles)
daa5b63ff6
am a6eb6ece: am 8829ffe0: am 07119f4a: Use the WebView\'s loader library to load the real library.
...
* commit 'a6eb6eceb0330508af47f4de697df7c7b85e5410':
Use the WebView's loader library to load the real library.
Remove WebView library preloading mechanism.
2014-07-17 18:29:12 +00:00
Przemyslaw Szczepaniak
9caab369fe
am 90d78fa4: am 95546693: Merge "Add AudioAttributes support in the TTS." into lmp-dev
...
* commit '90d78fa4ec5326d0cacfa5221c6675bc28b8c9d3':
Add AudioAttributes support in the TTS.
2014-07-17 18:23:39 +00:00
Dianne Hackborn
bf507a0cba
am 68f35ec2: am dbec91c0: Implement issue #16330060 : Inform ActivityManager about WebView...
...
* commit '68f35ec2d2f9950f57afa9900f16a3b29a8d55b0':
Implement issue #16330060 : Inform ActivityManager about WebView...
2014-07-17 18:22:17 +00:00
Sandeep Siddhartha
a25b93b226
am bb80d295: am aecd5383: Add recognition modes to the enrollment metadata
...
* commit 'bb80d295092220d204a74cca1d7d1c0fde93757b':
Add recognition modes to the enrollment metadata
2014-07-17 18:22:07 +00:00
Alan Viverette
238673f33a
am 4366255e: am bbbbb3b2: Add public attributes for TimePicker styling
...
* commit '4366255e3764c7e2db2221b58c9b438ac8fdc84d':
Add public attributes for TimePicker styling
2014-07-17 18:21:59 +00:00
Sandeep Siddhartha
177f0fd208
am a2440a17: am 43bc655b: Add code for isKeyphraseActive and some logging to help debug issues
...
* commit 'a2440a17e796d04ceb3470783d28f6080ee9c7dc':
Add code for isKeyphraseActive and some logging to help debug issues
2014-07-17 18:21:44 +00:00
Chris Craik
b7f22787ef
am 3e95764e: am b63869a6: Merge "Add accessibility text contrast setting" into lmp-dev
...
* commit '3e95764e68ea93918d455b8b2c08d9ff02dc36f8':
Add accessibility text contrast setting
2014-07-17 18:21:26 +00:00
Vinit Deshpande
b42cf4ea56
am ff5ceb0d: am 0b4d73dd: Merge "Introduce RTT Manager" into lmp-dev
...
* commit 'ff5ceb0d89c549682b498522f052d61c776bff03':
Introduce RTT Manager
2014-07-17 18:20:48 +00:00
Jeff Davidson
d66291503a
am 62152268: Merge "Expose network scoring APIs to /system apps." into lmp-dev
...
* commit '62152268d51b8b7726a806e48750a810e23eab40':
Expose network scoring APIs to /system apps.
2014-07-17 18:20:22 +00:00
Alan Viverette
6bf5ae966f
am 8e97a200: Fix software dirty region, don\'t add insets to software windows
...
* commit '8e97a200ecf1985dcf2fd3a004b53e59640b3374':
Fix software dirty region, don't add insets to software windows
2014-07-17 18:14:28 +00:00
Yigit Boyar
2c6cdd9500
am d8607b40: Merge "Change Animators to reset values when restarted if their target changes" into lmp-dev
...
* commit 'd8607b40b57332619f3be66ffa5250394acbc5f7':
Change Animators to reset values when restarted if their target changes
2014-07-17 18:14:23 +00:00
John Reck
52d2b2df9d
am c1d32f0c: Merge "Fix root RenderNode damage calculation" into lmp-dev
...
* commit 'c1d32f0c5c5832a3bbf923a92d62b2e434dfe70b':
Fix root RenderNode damage calculation
2014-07-17 18:14:18 +00:00
destradaa
6ccb5f894e
Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev
2014-07-17 18:11:21 +00:00
Zhijun He
83159151f6
Camera2: replace partial quirks with normal partial result
...
Change-Id: I56550748478bf0aa1a7bf9a350b4fdc7bbd6af86
2014-07-17 20:08:32 +00:00
destradaa
3b0224dc3c
Fix exceptions in ActivityRecognition platform stack.
...
b/16348349
Change-Id: I1f85283c86130b86389a1be7da49904658b0558c
2014-07-17 11:09:46 -07:00
Sailesh Nepal
909d1b5755
resolved conflicts for merge of 03e88771 to master
...
Change-Id: If55838968d008043f85a3cda1a2e0f76f357aec3
2014-07-17 11:05:42 -07:00
Chris Craik
6712495297
Merge "Simplify ViewRootImpl's AttachInfo usage" into lmp-dev
2014-07-17 18:05:14 +00:00
Chris Craik
d36a81f392
Simplify ViewRootImpl's AttachInfo usage
...
Change-Id: I4230e95ed5a52c8c5fae7d7b8d58827925db13ba
2014-07-17 11:14:15 -07:00
Ruben Brunk
40001f5dac
camera2: Fix swapped Face detection commands.
...
Bug: 16343647
Change-Id: I06186b1d6a2ef5d73d2e22759e947156d43cab3f
2014-07-17 18:04:42 +00:00
Christopher Tate
2e40d115ca
Add BackupAgent.onRestoreFinished() callback
...
The agent's onRestoreFinished() method is called after all available
data has been delivered to the app, whether via the key/value restore
API or the full-data file-at-a-time API. This gives the app a stable
opportunity to do any postprocessing that might be appropriate.
Also fixes a lingering bug in the framework's handling of backup
agent lifetimes. In cases where an existing agent instances was
being rebound, the framework was forgetting to notify the dependent
that the agent was available. This was causing timeouts and restore
failure.
Bug 16241004
Change-Id: I3f52b299312d30d38b0cba63a2cfaeb934991ef2
2014-07-17 17:43:24 +00:00
Martin Kosiba
7df3625d5b
Allow for appending of resources to an AssetManager.
...
BUG: 11505352
Change-Id: Ifa290580a6dc63c2f471d0bbf5f066db14aed4d7
2014-07-17 18:10:02 +01:00
Alexandra Gherghina
999d394ade
Ads per-user APIs to manage accounts through the AccountManager
...
Bug: 16056552
Bug: 14642886
Change-Id: I17ff6c2515285e63c84cecf2f861d10666c393c5
2014-07-17 17:08:49 +00:00
Christopher Tate
e2ba7a37fc
am c92b1dd5: Merge "Always call finishBackup() if performFullBackup() succeeded" into lmp-dev
...
* commit 'c92b1dd5f3e06a7e43f4086b2db418a8334aa7d2':
Always call finishBackup() if performFullBackup() succeeded
2014-07-17 16:45:23 +00:00
Fabrice Di Meglio
79b834078e
am fd6eeda0: Fix bug #16309454 Broken recent button after dismissing set time dialog
...
* commit 'fd6eeda0f7f578735a9b2b6a36fb1f130993f488':
Fix bug #16309454 Broken recent button after dismissing set time dialog
2014-07-17 16:45:01 +00:00
Jeff Davidson
46b6f2a8f4
am 8f406122: Remove obsolete remark from XXHDPI comment.
...
* commit '8f4061221469cde3d92b6f7dede5c8b10df1edc0':
Remove obsolete remark from XXHDPI comment.
2014-07-17 16:44:56 +00:00
Torne (Richard Coles)
08cfaf6726
Use the WebView's loader library to load the real library.
...
Load libwebviewchromiumloader and use it to load the real WebView
library, to enable sharing of the relro segment between different
application processes without requiring that the library be preloaded in
the zygote. A system service is added to track whether the relro segment
file has been prepared, and block loading of the library until it has
been.
Bug: 13005501
Change-Id: I846b37c7b8e2a4eb8a39e4fd455bccbb2048c173
2014-07-17 09:18:43 -07:00
Torne (Richard Coles)
b5de924fad
Remove WebView library preloading mechanism.
...
We don't want to preload the WebView library in the zygote process any
more, as loading an updatable WebView in the zygote is a stability risk.
The memory benefits of preloading will be obtained in other ways.
Bug: 13005501
Change-Id: Ic89f2a1d057dc92b01fb775bf326b47ac2d4caa2
2014-07-17 09:18:43 -07:00
Barnaby James
48f3552093
Add intents for setting airplane and zen mode by voice only.
...
Change-Id: I28a262da86eb102d1bd12265f96db0efec5db203
2014-07-17 07:24:09 -07:00
ztenghui
3f55ce84ff
am 7fdb6e06: am 6f5df881: Merge "Add more reverse support to AnimatedVD" into lmp-dev
...
* commit '7fdb6e0658855bb0a3ffe78c05bf509aa73aa1d7':
Add more reverse support to AnimatedVD
2014-07-17 14:12:58 +00:00
Julia Reynolds
38d3c26fd5
Merge "Update message on DISALLOW_REMOVE_USERS constant." into lmp-dev
2014-07-17 07:39:11 +00:00
Julia Reynolds
5b8224901b
Update message on DISALLOW_REMOVE_USERS constant.
...
Change-Id: I4f873eba4082278553ded830bb902fb3a3195d87
2014-07-17 11:50:05 -04:00
Dianne Hackborn
fee756ff91
Implement issue #16330060 : Inform ActivityManager about WebView...
...
...state changes.
Add a new API to tell the activity manager about a new dependency
one process has on another package. Start using it already for
when apps is Context.createPackageContext() to load code from another
app.
Also do some work on getting the monitoring of proc/uid states
in shape so it can be used by unundled code, along with an
AppImportanceMonitor class for doing so.
Some small fixes and additions to VoiceInteractionService.
Improve handling of unaccounted/overcounted battery use so that
they aren't shown to the user unless they are significant.
Change-Id: I22dd79a73f4e70103d3f8964494aebc8a31f971c
2014-07-16 22:50:31 -07:00
Sandeep Siddhartha
e6cd2476aa
Add recognition modes to the enrollment metadata
...
This will be used by the Voice interaction service to determine what type of recognition may be run
on the DSP. e.g. If the DSP supports voice trigger only for the given keyphrase,
the voice interaction service may want to perform user identification at its end.
Also support keyphrase metadata for all keyphrases and locales.
In case the enrollment app supports open-ended keyphrases, it can leave the keyphrase text
to be empty
similarly, if the enrollment app supports all locales, it can leave the supported locales
attribute to be empty,
Change-Id: I782a17a877fc79ed569fa7c3a81697641182590b
2014-07-16 22:03:03 -07:00
Alan Viverette
5134478151
Add public attributes for TimePicker styling
...
BUG: 11218747
Change-Id: Ifdf981280ebe20a9066f219c9a4505d0d7486b2e
2014-07-17 04:36:11 +00:00
Sandeep Siddhartha
a433af6b73
Add code for isKeyphraseActive and some logging to help debug issues
...
Change-Id: I89f2090be5a5fe5f7c0da1648a0d46a093893fe2
2014-07-16 19:52:32 -07:00