143406 Commits

Author SHA1 Message Date
ztenghui
738177caf6 Add the RTL support to VectorDrawable.
bug:15905631

Change-Id: Ieb3dcac2dd446ba89f307716411688dcd6ec5279
2014-07-17 17:37:19 +00:00
John Reck
580ff8142b Revert "Separate Canvas JNI code from the implementation."
This reverts commit e28a5afee885cd69a5be5809f88116b601cb1a72.

 Appears to cause memory corruption and random appearances of
 chinese

 Bug: 16343240
 Bug: 16336642

Change-Id: Ife169181f40adff4b12948ed5f9d3a88dcec935b
2014-07-17 17:36:24 +00:00
Winson Chung
4fc90de51b Fixing regression in flinging not updating the stack. (Bug 16371020)
Change-Id: I6397c854dc0d305206eb3b48de855c58cf2740ea
2014-07-17 17:33:03 +00:00
Scott Rowe
ff424377df cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
Change-Id: I2ee3cc1269fcd9b31f1f71fc5fc3cd8d62ebf31f
2014-07-17 10:13:53 -07:00
Joe Fernandez
e1e81a9ee0 am e287cf33: docs: Update ADT-1 page with supported apps
* commit 'e287cf33d4cd69aef2177d025a110cf8b9f0e267':
  docs: Update ADT-1 page with supported apps
2014-07-17 16:44:19 +00:00
Craig Mautner
b3325cbb26 Merge "resolved conflicts for merge of 0a931069 to lmp-dev" into lmp-dev 2014-07-17 16:16:48 +00:00
Craig Mautner
aa9b0f1575 resolved conflicts for merge of 0a931069 to lmp-dev
Conflicts:
	services/core/java/com/android/server/am/ActivityManagerService.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: I68e8290566b51fadb5671abdd9d05faf28502e22
2014-07-17 10:50:18 -07:00
Justin Koh
0a93106964 am 65d7c332: Merge "Additional cleanup after stack deletion." into klp-modular-dev
* commit '65d7c332d7b613f23a26066051cc7496e0efa994':
  Additional cleanup after stack deletion.
2014-07-17 10:56:16 +00:00
Justin Koh
75f317403f am 77cdac05: Merge "Wait for all windows to draw before turning screen on" into klp-modular-dev
* commit '77cdac05ba80925f6cdc4c349af0fa7567c36146':
  Wait for all windows to draw before turning screen on
2014-07-17 10:55:56 +00:00
Filip Gruszczynski
95198b9166 am 39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev
* commit '39f0e7da00eae4e5a331a9413a396f3dddbeb625':
  Using outset bottom from theme as bottom inset on circular screens.
2014-07-17 10:55:43 +00:00
Julia Reynolds
38d3c26fd5 Merge "Update message on DISALLOW_REMOVE_USERS constant." into lmp-dev 2014-07-17 07:39:11 +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
Julia Reynolds
5b8224901b Update message on DISALLOW_REMOVE_USERS constant.
Change-Id: I4f873eba4082278553ded830bb902fb3a3195d87
2014-07-17 11:50:05 -04:00
John Spurlock
969265af31 Merge "Zen: Maintain selection throughout rocker session." into lmp-dev 2014-07-17 07:39:11 +00:00
John Spurlock
fbb3d6ff39 Zen: Maintain selection throughout rocker session.
While the panel is visible, allow toggling between
none + priority (and even 'all') without resetting
the exit condition.

Bug:16350606
Change-Id: I830be8ccad1ba95a64239f00a72f773c4fe739f2
2014-07-17 12:09:05 -04:00
John Spurlock
f83fc9b48f Merge "Shade: Hide the status icons from the collapsed header." into lmp-dev 2014-07-17 07:12:45 +00:00
John Spurlock
07f6d3b6dd Shade: Hide the status icons from the collapsed header.
Only show wifi / cell / battery / user, the entire statusIcons
layout s/b hidden when reparented to the header.

Bug:16355667
Change-Id: I4c99ffed82af47c4e67e7915a8cb98fc04ad7017
2014-07-17 10:44:34 -04:00
Jungshik Jang
1827fdcbf6 Do no send <Feature Abort> as response of <Feature Abort>
Cec service replies <Feature Abort> back to original device
if incoming message is not handled by any of feature action or device.
It's applied to <Feature Abort> message itself, but it can cause
weird sideeffect of it.
This change just ignore <Feature Abort> even though it's not handled
by any of local device or feature actions.

Bug: 16359564
Change-Id: I925e89ca4db49a637dd296447c04eee1ba679c6b
2014-07-17 13:58:14 +09:00
Eino-Ville Talvala
7040e9f7fe Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev 2014-07-17 02:40:09 +00:00
Winson Chung
2f906e94c8 Merge "Fixing optimization in Task loading. (Bug 16372369)" into lmp-dev 2014-07-17 17:59:02 +00:00
Winson Chung
ff88d7b39e Fixing optimization in Task loading. (Bug 16372369) 2014-07-17 12:30:07 -07:00
Chris Craik
5d705ee6ad Merge "Minor cleanups around color usage" into lmp-dev 2014-07-17 18:05:14 +00:00
Chris Craik
98d608dba6 Minor cleanups around color usage
Change-Id: I56733cbe933a58d5977c032f056abb35265ee252
2014-07-17 12:25:11 -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
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
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
Ricardo Cervera
25303a980c Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 2014-07-17 02:29:54 +00:00
Andrew Lee
e7a7ec6db5 Merge "Pass through video state when answering a call." into lmp-dev 2014-07-17 02:29:54 +00:00
Andrew Lee
8da4c3c11f Pass through video state when answering a call.
Bug: 16013878
Bug: 16015750
Change-Id: Ia9ba6e5f78fcb64e1089db99f5ce11d0ef858ac9
2014-07-17 12:56:49 -07:00
Evan Charlton
9c33953e51 Merge "Plumb through StatusHints change notifications" into lmp-dev 2014-07-17 19:20:15 +00:00
Evan Charlton
5b49adea48 Plumb through StatusHints change notifications
When StatusHints are modified, inform listeners. Also expose two
constants for passing optional strings from the CallService to
the in-call UI.

Bug: 13334257
Bug: 13334252

Change-Id: If7fde7c1ca6940cec8b7232469a22900c36dbb17
2014-07-17 12:53:39 -07:00
Adrian Roos
9d32507a86 Merge "Update QS user switcher colors to spec" into lmp-dev 2014-07-17 00:15:07 +00:00
Adam Connors
c8fa3ae2ce Merge "Create DPM APIs for cross profile callerId" into lmp-dev 2014-07-17 00:15:07 +00:00
Adam Connors
210fe21e95 Create DPM APIs for cross profile callerId
Contact information in the managed profile is shown
in the incoming call UI unless blocked using this API.

TODO: Actually plumb this into the caller-id logic.

Bug: 16301261
Change-Id: If03adc907d9558baa0a45a1833b857206b7bf96a
2014-07-17 16:28:52 +01:00
Niels Egberts
b4a139cc12 Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev 2014-07-17 00:15:07 +00:00
Nancy Chen
5da0fd5e76 API changes to enable account selection for a call
If an account default is not set, the incall ui will display a dialog to
allow the user to select an account for that particular call.

Bug: 16243703

Change-Id: I8faf2f2ce0b2669a141562832f23e8f3ce88f094
2014-07-17 10:19:20 -07:00
Niels Egberts
36e08484ab TtsSpan builders for each TtsSpan type. DO NOT MERGE
The reason for separate classes for each type, instead of a more flat
structure is to enable easy discovery of the available arguments that
can be set. For L we'll have about 12 types with 30 arguments and
almost all of the arguments are type specific. In future releases
we'll introduce more arguments. With editors that have code completion
one can construct a span without having to consult the documentation.

For now it only contains Text and Cardinal types.

Change-Id: I94531e600133d9f4f59a4170cceef1ee7a360ca7
(cherry picked from commit 90b095aabd8a5c43723821dda37354fd2beb38fb)
2014-07-17 17:17:07 +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
Craig Mautner
45374c9afa Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev 2014-07-17 16:16:48 +00:00
Craig Mautner
efc81e7d5e resolved conflicts for merge of 75f31740 to lmp-dev
Conflicts:
	services/core/java/com/android/server/wm/WindowManagerService.java

Change-Id: Ifdfe253c4b3410a6000fd5a7cdcd785adc80a47b
2014-07-17 10:05:07 -07:00
Amith Yamasani
3f4f2fbcd0 Merge "Keep track of user_setup_complete in DPMS" into lmp-dev 2014-07-17 16:16:48 +00:00
Jae Seo
874f95ca73 Merge "TIF: Add TvInputInfo.getParentId" into lmp-dev 2014-07-17 16:16:48 +00:00
Ji-Hwan Lee
66bdf247df TIF: Add TvInputInfo.getParentId
Bug: 16166859
Change-Id: I07130b6f974ca7b2527aba68b92dc31fb4b5a139
2014-07-17 14:40:31 +09:00
Sandeep Siddhartha
2883ba6975 Plumb the database code to read/update sound models
Change-Id: I135131b042481462f905bdb69ea8544e2561d177
2014-07-16 22:10:45 -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