Eino-Ville Talvala
aff282506f
am 7e6dd457: am 97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev
...
* commit '7e6dd45734c4eb906f20d02d326ee1ee19a55bb9':
Add PackageManager features for differentiating camera2 devices
2014-07-17 20:59:30 +00:00
Chris Craik
e7edf9587e
am deec48ed: am 19f0c01c: Merge "Simplify ViewRootImpl\'s AttachInfo usage" into lmp-dev
...
* commit 'deec48edf40ba4ebdd7bf6cb281b03b0cd8d231e':
Simplify ViewRootImpl's AttachInfo usage
2014-07-17 20:59:17 +00:00
Amith Yamasani
74b5b4005b
am 562b7f0d: am 56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev
...
* commit '562b7f0d1373404682e35bd37c99907d3d94e29a':
Split telephony restrictions into outgoing calls and sms
2014-07-17 20:59:12 +00:00
Adam Powell
128beccbe5
am 35b4be8b: am 21b1b8b9: Add nested pre-fling for nested scrolling
...
* commit '35b4be8b87452a169cc3f3c55ea4aee37ef2e076':
Add nested pre-fling for nested scrolling
2014-07-17 20:58:56 +00:00
Ruben Brunk
e5d53bd1ba
am ff8ea9c5: am 0a749af3: Merge "camera2: Fix swapped Face detection commands." into lmp-dev
...
* commit 'ff8ea9c5f1a0651bd2230c62e3e6be85ba24fb0e':
camera2: Fix swapped Face detection commands.
2014-07-17 20:58:38 +00:00
Christopher Tate
be786a1f69
am 5763ad39: am e78826f6: Add BackupAgent.onRestoreFinished() callback
...
* commit '5763ad39f5cb5923b910c7cbd834707f65043bde':
Add BackupAgent.onRestoreFinished() callback
2014-07-17 20:58:09 +00:00
Adam Connors
f8904a2b43
am bab7ceaf: am d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev
...
* commit 'bab7ceaf157a81d18ee1404bb6a17c6c05549f5b':
Create DPM APIs for cross profile callerId
2014-07-17 20:57:53 +00:00
Niels Egberts
f8f3a34570
am 64b0ebfc: am a66d298e: Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev
...
* commit '64b0ebfcf9644c99d70e639eee14536e9f64484f':
TtsSpan builders for each TtsSpan type. DO NOT MERGE
2014-07-17 20:57:50 +00:00
Martin Kosiba
0db75fe2b0
am fbb2246c: am 92486999: Allow for appending of resources to an AssetManager.
...
* commit 'fbb2246c6d72d98452fcda9b6a79689012eb5614':
Allow for appending of resources to an AssetManager.
2014-07-17 20:57:38 +00:00
Alexandra Gherghina
02e130fccf
am 14b5a9b4: am dbfd0744: Ads per-user APIs to manage accounts through the AccountManager
...
* commit '14b5a9b452d8b47617f5d908778caaf745527fe9':
Ads per-user APIs to manage accounts through the AccountManager
2014-07-17 20:57:31 +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
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
Julia Reynolds
56447371f3
am d7dd3073: am 9c9cb566: Merge "Update message on DISALLOW_REMOVE_USERS constant." into lmp-dev
...
* commit 'd7dd3073762c2b89dbd655aeb22602fd701d6ae3':
Update message on DISALLOW_REMOVE_USERS constant.
2014-07-17 17:07:10 +00:00
Torne (Richard Coles)
cf04fc99c2
am 8829ffe0: am 07119f4a: Use the WebView\'s loader library to load the real library.
...
* commit '8829ffe031d612248a1a02d89e923f4c6c947fb0':
Use the WebView's loader library to load the real library.
Remove WebView library preloading mechanism.
2014-07-17 17:07:04 +00:00
Przemyslaw Szczepaniak
df772272d5
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 17:06:43 +00:00
Dianne Hackborn
ec18364c7b
am 68f35ec2: am dbec91c0: Implement issue #16330060 : Inform ActivityManager about WebView...
...
* commit '68f35ec2d2f9950f57afa9900f16a3b29a8d55b0':
Implement issue #16330060 : Inform ActivityManager about WebView...
2014-07-17 17:05:26 +00:00
Sandeep Siddhartha
4c4e3ce2f5
am bb80d295: am aecd5383: Add recognition modes to the enrollment metadata
...
* commit 'bb80d295092220d204a74cca1d7d1c0fde93757b':
Add recognition modes to the enrollment metadata
2014-07-17 17:05:18 +00:00
Alan Viverette
8b0d8b4b2d
am 4366255e: am bbbbb3b2: Add public attributes for TimePicker styling
...
* commit '4366255e3764c7e2db2221b58c9b438ac8fdc84d':
Add public attributes for TimePicker styling
2014-07-17 17:05:13 +00:00
Sandeep Siddhartha
470c9a9898
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 17:05:01 +00:00
Lorenzo Colitti
19718c8c19
am 84641420: am 1098531c: Disable logging in NetlinkTracker.
...
* commit '84641420220d2d11e7baa7ae6061d78f31d97c98':
Disable logging in NetlinkTracker.
2014-07-17 17:04:49 +00:00
Chris Craik
4ada26905d
am 3e95764e: am b63869a6: Merge "Add accessibility text contrast setting" into lmp-dev
...
* commit '3e95764e68ea93918d455b8b2c08d9ff02dc36f8':
Add accessibility text contrast setting
2014-07-17 17:04:46 +00:00
Vinit Deshpande
110411dbf3
am ff5ceb0d: am 0b4d73dd: Merge "Introduce RTT Manager" into lmp-dev
...
* commit 'ff5ceb0d89c549682b498522f052d61c776bff03':
Introduce RTT Manager
2014-07-17 17:04:15 +00:00
Jeff Davidson
e3b002c01e
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 17:03:45 +00:00
Brian Colonna
73882b58c3
am 6f6fcecb: Bug 16152902: Disabling FUL in keyguard and screen lock settings
...
* commit '6f6fcecb4e13e5cbfb836b66e49001e34bd0c10c':
Bug 16152902: Disabling FUL in keyguard and screen lock settings
2014-07-17 17:01:50 +00:00
Fabrice Di Meglio
a75a95a22a
am 6bbea8cf: Fix LocalePicker background
...
* commit '6bbea8cf4252839d0c6f2a3152f506a7b2b2d753':
Fix LocalePicker background
2014-07-17 16:59:35 +00:00
Alan Viverette
d4d40b32e6
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 16:59:07 +00:00
Yigit Boyar
8330ad22a1
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 16:59:03 +00:00
John Reck
624e910ebd
am c1d32f0c: Merge "Fix root RenderNode damage calculation" into lmp-dev
...
* commit 'c1d32f0c5c5832a3bbf923a92d62b2e434dfe70b':
Fix root RenderNode damage calculation
2014-07-17 16:58:59 +00:00
Sailesh Nepal
f980901bca
am 03e88771: TTY: frameworks/base changes
...
* commit '03e88771769c376017af281d3c23ac0e030fee52':
TTY: frameworks/base changes
2014-07-17 16:58:39 +00:00
Christopher Tate
50d11a6a9a
am c92b1dd5: Merge "Always call finishBackup() if performFullBackup() succeeded" into lmp-dev
...
* commit 'c92b1dd5f3e06a7e43f4086b2db418a8334aa7d2':
Always call finishBackup() if performFullBackup() succeeded
2014-07-17 16:58:34 +00:00
Fabrice Di Meglio
ab8db6d9c4
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:58:13 +00:00
Jeff Davidson
e9c77be05e
am 8f406122: Remove obsolete remark from XXHDPI comment.
...
* commit '8f4061221469cde3d92b6f7dede5c8b10df1edc0':
Remove obsolete remark from XXHDPI comment.
2014-07-17 16:58:09 +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
ztenghui
ab36c677ba
am 6f5df881: Merge "Add more reverse support to AnimatedVD" into lmp-dev
...
* commit '6f5df88108b7fb6b9a59ac36f448bd23b5397ef1':
Add more reverse support to AnimatedVD
2014-07-17 14:02:46 +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
Eino-Ville Talvala
7040e9f7fe
Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev
2014-07-17 02:40:09 +00:00
Eino-Ville Talvala
611fecec08
Add PackageManager features for differentiating camera2 devices
...
Also rename DNG capability to RAW.
Bug: 15415688
Change-Id: I1ea9f65b03c4fa06a5004f9d1d485935742001c8
2014-07-17 10:58:16 -07:00
Amith Yamasani
bb4d6a20bd
Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev
2014-07-17 02:34:24 +00:00
Amith Yamasani
390989da19
Split telephony restrictions into outgoing calls and sms
...
DISALLOW_TELEPHONY renamed to DISALLOW_OUTGOING_CALLS and introduced
DISALLOW_SMS.
Outgoing emergency calls should always be permitted.
Change-Id: I0a38ef6e2df9dcf62d16fd93622ad61f4327614f
2014-07-17 12:14:52 -07:00