drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,378 Commits 1 Branch 0 Tags
Commit Graph

127378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
7631b3ee27 am b9a7d8c2: Merge "Adding activity icon to the task view" 
* commit 'b9a7d8c2c46e71f756da69d7682bfc594b2a91ed':
  Adding activity icon to the task view
 2014-04-03 21:11:25 +00:00
Winson Chung
b9a7d8c2c4 Merge "Adding activity icon to the task view" 2014-04-03 21:07:56 +00:00
Craig Mautner
54d5483c28 am eb6387c1: Merge "Add the persistable attribute for Activities" 
* commit 'eb6387c16149e4d84dcb15427bb7ca8d0495554d':
  Add the persistable attribute for Activities
 2014-04-03 20:56:20 +00:00
Dianne Hackborn
d21310ae0f am 5d5902d1: Merge "Don\'t allow -1 uids for wake locks." 
* commit '5d5902d140040936fa6aa7e443220140af0e9843':
  Don't allow -1 uids for wake locks.
 2014-04-03 20:56:17 +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
a6066bb7a4 am 35fc6a02: Merge "Implement setActivityLabelAndIcon()." 
* commit '35fc6a02aeded9578375af5828e14043164028d5':
  Implement setActivityLabelAndIcon().
 2014-04-03 20:43:44 +00:00
Craig Mautner
35fc6a02ae Merge "Implement setActivityLabelAndIcon()." 2014-04-03 20:37:29 +00:00
Jorim Jaggi
18d084698c resolved conflicts for merge of 93160828 to master-lockscreen-dev 
Change-Id: Ief6d6b8b8cc9ae2eb38442a3ba9ecae4637b75d6
 2014-04-03 21:07:39 +02: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
a66a735dc6 am ef4c0c9f: Merge "Move most TransformationInfo properties to RenderNode" 
* commit 'ef4c0c9fd5db395b2eea0a246b93bce9cc9e859a':
  Move most TransformationInfo properties to RenderNode
 2014-04-03 17:20:10 +00:00
Chris Craik
ef4c0c9fd5 Merge "Move most TransformationInfo properties to RenderNode" 2014-04-03 17:14:53 +00:00
Raph Levien
89bebfc7c7 am 537be409: am c333381b: am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements" 
* commit '537be409f281d4a872cbcebb6ac3a4d767ded4da':
  Marquee text RTL improvements
 2014-04-03 17:13:12 +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
Narayan Kamath
1db17807f8 am c6f6ba32: am 71ae2bd4: am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen" 
* commit 'c6f6ba3265d2b07649277682fd3ca0f9ce4d011a':
  Remove ProcessState::mArgc,mArgV,mArgLen
 2014-04-03 17:00:47 +00:00
Ben Murdoch
2be2f478bb am 33822312: am 55da6228: (-s ours) am 14424043: am 369a0057: Merge "Update ViewRootImpl for 64bit functor type." 
* commit '33822312e65a38400b189c6deda59b8d047b89cf':
  Update ViewRootImpl for 64bit functor type.
 2014-04-03 17:00:41 +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
9b1023a965 am a0a09e88: Merge "Clean up on VectorDrawable." 
* commit 'a0a09e88ddd3292ec19cb2dcb1847348df3d16d1':
  Clean up on VectorDrawable.
 2014-04-03 16:36:10 +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
05956ac302 am 10a5ec23: am c2cebee6: am 8db6d9af: Merge "Clean up certain state transitions in DreamService." into klp-modular-dev 
* commit '10a5ec230f41fcfba7bdd0acb32f7bb113eba3da':
  Clean up certain state transitions in DreamService.
 2014-04-03 08:41:20 +00:00
Jeff Tinker
5b55c77511 am 36ba373e: am 4f342e87: (-s ours) am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev 
* commit '36ba373e09d7cebef8b58c9e985314ebe847aa35':
  Add signature|system permission to MediaDrm signer APIs
 2014-04-03 08:41:17 +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
031c49ff1c am aa11084c: Merge "Fix dialog style, selectable item bg pinning, and pressed state" 
* commit 'aa11084c3ba1bf166febce53ccb9852f72f2a4a5':
  Fix dialog style, selectable item bg pinning, and pressed state
 2014-04-03 02:38:22 +00: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
53c4d55897 am f6028359: am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev 
* commit 'f60283598751cbbdb65b2a59d2294e23bb4dfb99':
  Use build property for CEC device OSD name
 2014-04-03 02:17:08 +00: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
fe83576b55 am 8ccaedb5: am d66d3e73: am 7b4c9725: Merge "Fix build breakage by updating current.txt" into klp-modular-dev 
* commit '8ccaedb51b0734d2711b8bf86f6ffeb57a5da172':
  Fix build breakage by updating current.txt
 2014-04-03 01:44:31 +00:00
Katie McCormick
e547056720 am 62b7e66e: am 035a2bbd: am 85588d19: am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs 
* commit '62b7e66e0356810bd11931edf6c14959b70be996':
  docs: MediaRouteProvider Developer Guide
 2014-04-03 01:44:28 +00:00
Jinsuk Kim
64b1ad5a39 am c9cb9138: am 4c963841: am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev 
* commit 'c9cb91388b268608c8b7f588dca8417f2661f0ed':
  Maintain display power status for playback device
 2014-04-03 01:44:24 +00:00
Christopher Tate
4a7000924a am a7d9b937: Merge "Refuse update of a system app if it changes its shared uid" 
* commit 'a7d9b93756c8b1e61a721fe14d941ee7ab975513':
  Refuse update of a system app if it changes its shared uid
 2014-04-03 01:44:20 +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