Winson Chung
b9a7d8c2c4
Merge "Adding activity icon to the task view"
2014-04-03 21:07:56 +00:00
Craig Mautner
eb6387c161
Merge "Add the persistable attribute for Activities"
2014-04-03 20:51:22 +00:00
Dianne Hackborn
5d5902d140
Merge "Don't allow -1 uids for wake locks."
2014-04-03 20:49:57 +00:00
Craig Mautner
35fc6a02ae
Merge "Implement setActivityLabelAndIcon()."
2014-04-03 20:37:29 +00:00
Dianne Hackborn
ef640cdfb2
Don't allow -1 uids for wake locks.
...
Change-Id: Ia1b412a166f69247be3b047138349e7b4031bd7d
2014-04-03 11:20:15 -07:00
Selim Cinek
9316082809
Merge "Enabled the new notification shade and improved expanding logic"
2014-04-03 17:58:47 +00:00
Craig Mautner
4cfa8dc77a
Add the persistable attribute for Activities
...
This is used for documents to allow them to be persisted across
reboots.
Fixes bug 13735406.
Change-Id: I5655ac99589d58ed5716429cf7a1ffeee677aee1
2014-04-03 10:40:43 -07:00
Chris Craik
ef4c0c9fd5
Merge "Move most TransformationInfo properties to RenderNode"
2014-04-03 17:14:53 +00:00
Raph Levien
537be409f2
am c333381b: am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements"
...
* commit 'c333381b4c1b46f13f75388099cafb740844c497':
Marquee text RTL improvements
2014-04-03 17:09:26 +00:00
Selim Cinek
b6d85ebfe4
Enabled the new notification shade and improved expanding logic
...
Made the NotificationStackScroller now the default and only shade.
When the notification shade is expanded, the NotificationStackScroller
now also expands revealing the notifications.
Change-Id: If989ed848f684b3ac4e687d9642289db4599553b
2014-04-03 18:59:37 +02:00
Narayan Kamath
c6f6ba3265
am 71ae2bd4: am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"
...
* commit '71ae2bd42be21de6d25d1f8c52e3973c172462df':
Remove ProcessState::mArgc,mArgV,mArgLen
2014-04-03 16:56:32 +00:00
Ben Murdoch
33822312e6
am 55da6228: (-s ours) am 14424043: am 369a0057: Merge "Update ViewRootImpl for 64bit functor type."
...
* commit '55da62288dcec75c34721a59d71f917dcb8a62b4':
Update ViewRootImpl for 64bit functor type.
2014-04-03 16:56:24 +00:00
ztenghui
a0a09e88dd
Merge "Clean up on VectorDrawable."
2014-04-03 16:32:28 +00:00
Raph Levien
c333381b4c
am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements"
...
* commit '24a2f20fe64e893e28dc70b288e12567ff71019f':
Marquee text RTL improvements
2014-04-03 16:02:39 +00:00
Raph Levien
24a2f20fe6
am c420ce34: Merge "Marquee text RTL improvements"
...
* commit 'c420ce34ba177cd959cbb9432e9597d377e6cee6':
Marquee text RTL improvements
2014-04-03 15:55:22 +00:00
Raph Levien
c420ce34ba
Merge "Marquee text RTL improvements"
2014-04-03 15:50:29 +00:00
Narayan Kamath
71ae2bd42b
am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"
...
* commit 'f87b3a25b928f145558f6f60183944f513878b63':
Remove ProcessState::mArgc,mArgV,mArgLen
2014-04-03 14:11:34 +00:00
Narayan Kamath
f87b3a25b9
am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"
...
* commit '374db6c3792e9ed56230e09fee4742632ce8159a':
Remove ProcessState::mArgc,mArgV,mArgLen
2014-04-03 14:05:28 +00:00
Narayan Kamath
374db6c379
Merge "Remove ProcessState::mArgc,mArgV,mArgLen"
2014-04-03 13:59:38 +00:00
Narayan Kamath
a23fcd7be8
Remove ProcessState::mArgc,mArgV,mArgLen
...
These look like historical oddities, and weren't really being
used for anything useful.
Process:setArgV0 was being called by android.util.Process, but
that functionality can be moved directly into the implementation
of that class.
bug: 13647418
Change-Id: I216c8f8a4c065f0cf3a61f19f9e32decd26f93f6
2014-04-03 12:29:07 +00:00
Ben Murdoch
55da62288d
am 14424043: am 369a0057: Merge "Update ViewRootImpl for 64bit functor type."
...
* commit '14424043b9c20edf639004e05fe8e9264a2e66f5':
Update ViewRootImpl for 64bit functor type.
2014-04-03 10:00:25 +00:00
Ben Murdoch
14424043b9
am 369a0057: Merge "Update ViewRootImpl for 64bit functor type."
...
* commit '369a00574da218975718ce07ffe6abba5c17bf92':
Update ViewRootImpl for 64bit functor type.
2014-04-03 09:54:33 +00:00
Ben Murdoch
369a00574d
Merge "Update ViewRootImpl for 64bit functor type."
2014-04-03 09:48:43 +00:00
Jeff Brown
10a5ec230f
am c2cebee6: am 8db6d9af: Merge "Clean up certain state transitions in DreamService." into klp-modular-dev
...
* commit 'c2cebee67a2dafe850e39b2ae3bc8b2f44426901':
Clean up certain state transitions in DreamService.
2014-04-03 08:31:33 +00:00
Jeff Tinker
36ba373e09
am 4f342e87: (-s ours) am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev
...
* commit '4f342e878d88b1f75a9b487e2aa0582b59e29083':
Add signature|system permission to MediaDrm signer APIs
2014-04-03 08:31:19 +00:00
Jeff Brown
c2cebee67a
am 8db6d9af: Merge "Clean up certain state transitions in DreamService." into klp-modular-dev
...
* commit '8db6d9af58b9b81dbd764acd3f6a379afb539bf6':
Clean up certain state transitions in DreamService.
2014-04-03 03:25:02 +00:00
Jeff Brown
8db6d9af58
Merge "Clean up certain state transitions in DreamService." into klp-modular-dev
2014-04-03 03:20:01 +00:00
Jeff Brown
344812d2f3
Clean up certain state transitions in DreamService.
...
Instead of posting onDreamingStarted() to a handler from attach(), do
the work immediately. This ensures that the dream is actually in the
expected state when the callback runs. Previously it was possible
for the callback to run after detach() occurred which could cause
exceptions and unexpected behavior. As it happens, there's no need
to post this callback since attach() already runs on the UI thread.
Handle certain races involving the window token lifecycle a little
better. When the dream manager shuts down a dream, it removes the
window token. This can happen before the dream completes its attach()
phase in which case a BadTokenException is thrown. We now handle this
exception and abort the dream in anticipation of receiving a request
to finish it immediately.
Add a safeguard to getDozeHardware() to handle the case where it
might inadvertently be called at the wrong point in the lifecycle.
Bug: 13475612
Bug: 13760290
Change-Id: I9bc9c154370d08d7727b568d398c460a38592099
2014-04-02 20:17:32 -07:00
Alan Viverette
aa11084c3b
Merge "Fix dialog style, selectable item bg pinning, and pressed state"
2014-04-03 02:33:02 +00:00
Alan Viverette
45dc35b3c9
Fix dialog style, selectable item bg pinning, and pressed state
...
BUG: 13746931
Change-Id: I31c2959f3e773a3aeb66ba5842d8d6fbb288acc1
2014-04-02 19:32:15 -07:00
Jinsuk Kim
f602835987
am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev
...
* commit 'f2fe3505dac16dfa990fbab56713abab6ba0bc54':
Use build property for CEC device OSD name
2014-04-03 02:11:40 +00:00
Jinsuk Kim
8ccaedb51b
am d66d3e73: am 7b4c9725: Merge "Fix build breakage by updating current.txt" into klp-modular-dev
...
* commit 'd66d3e736fa101b48076433bc305971a19bb8f6f':
Fix build breakage by updating current.txt
2014-04-03 01:41:24 +00:00
Katie McCormick
62b7e66e03
am 035a2bbd: am 85588d19: am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
...
* commit '035a2bbd8b8720673e068cf06d646e616a10ab34':
docs: MediaRouteProvider Developer Guide
2014-04-03 01:41:20 +00:00
Jinsuk Kim
c9cb91388b
am 4c963841: am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev
...
* commit '4c963841db60ed59fd59a6fba79f8e3e6ec7f349':
Maintain display power status for playback device
2014-04-03 01:41:13 +00:00
Christopher Tate
a7d9b93756
Merge "Refuse update of a system app if it changes its shared uid"
2014-04-03 01:39:36 +00:00
Chris Craik
49e6c73913
Move most TransformationInfo properties to RenderNode
...
This change dedupes the various properties that were represented both
in TransformationInfo, and RenderProperties on the native side.
RenderNode (and its associated properties) are now permanently
attached to a View in SW or HW. The native copy of these properties
are their sole representation.
Alpha to come in a later CL.
Also fixed issue with copying RenderNode's transform, and added
support of deleting RenderNodes in software rendering.
Change-Id: Ideb6e7f32b780e87aa1c32637c368356b3eee3a1
2014-04-02 18:38:25 -07:00
Jeff Tinker
4f342e878d
am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev
...
* commit '4995d72520d16302fca13bc4614d1dd3c0d1c17c':
Add signature|system permission to MediaDrm signer APIs
2014-04-03 01:35:28 +00:00
Jeff Tinker
4995d72520
Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev
2014-04-03 01:30:42 +00:00
Jinsuk Kim
f2fe3505da
am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev
...
* commit '31518f745ffa5e832274c332ac957a065948fdaf':
Use build property for CEC device OSD name
2014-04-03 00:39:23 +00:00
Jinsuk Kim
31518f745f
Merge "Use build property for CEC device OSD name" into klp-modular-dev
2014-04-03 00:35:09 +00:00
ztenghui
fba3bad387
Clean up on VectorDrawable.
...
Rename the test from DynamicDrawableTest to VectorDrawableTest.
Remove duplicate function calls in the test.
Fix comments in VectorDrawable
Change-Id: I1ef87137088ccc10b1abdb40ca368345d9dbadab
2014-04-02 17:31:08 -07:00
Christopher Tate
c935d1f111
Refuse update of a system app if it changes its shared uid
...
Bug 13657183
Change-Id: I6d8fb9c8810ca896d2d10e5a80a3c4a50c9e4fed
2014-04-02 17:00:04 -07:00
Alan Viverette
1970f57071
Don't use TypedArray after recycling it
...
BUG: 13771701
Change-Id: Ib3ccb270f44cd236ce5294f8d0e01f1922005a3b
2014-04-02 16:46:31 -07:00
Jeff Tinker
65c94e6959
Add signature|system permission to MediaDrm signer APIs
...
Also addresses style issues noted in post-submit review from
https://googleplex-android-review.git.corp.google.com/#/c/439054/
Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5
related-to-bug: 12702350
2014-04-02 16:43:10 -07:00
Jinsuk Kim
d66d3e736f
am 7b4c9725: Merge "Fix build breakage by updating current.txt" into klp-modular-dev
...
* commit '7b4c972577179b2dfcf8a59c31b3730d097c5d46':
Fix build breakage by updating current.txt
2014-04-02 23:17:23 +00:00
Katie McCormick
035a2bbd8b
am 85588d19: am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
...
* commit '85588d19bd9fce3d7e837c14e0b9d50cf3a75904':
docs: MediaRouteProvider Developer Guide
2014-04-02 23:17:20 +00:00
Jinsuk Kim
7b4c972577
Merge "Fix build breakage by updating current.txt" into klp-modular-dev
2014-04-02 23:12:09 +00:00
Katie McCormick
85588d19bd
am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
...
* commit 'cd536cb32927d74ac8181c8636f2971cb39e7fda':
docs: MediaRouteProvider Developer Guide
2014-04-02 23:11:20 +00:00
Jinsuk Kim
196b6dd13e
Fix build breakage by updating current.txt
...
Change-Id: If9434850c24c8e97bdd49952fb3180d139cab101
2014-04-03 08:10:55 +09:00
Katie McCormick
cd536cb329
am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
...
* commit '0cdf60472be5efc1b6e8ef125f96ba014870b345':
docs: MediaRouteProvider Developer Guide
2014-04-02 23:05:04 +00:00