Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,763 Commits 3 Branches 0 Tags
33ae1476a01b674d22ddac75da98e25be99d84ba
Commit Graph

35101 Commits

Author SHA1 Message Date
Paul Lawrence
33ae1476a0 am f17f0e0e: Merge "Save OwnerInfo so CryptKeeper can display at boot time" 
* commit 'f17f0e0eb0eef424401caa122e51a648f5ef3801':
  Save OwnerInfo so CryptKeeper can display at boot time
 2014-04-04 14:13:40 +00:00
Paul Lawrence
f17f0e0eb0 Merge "Save OwnerInfo so CryptKeeper can display at boot time" 2014-04-04 14:05:56 +00:00
Craig Mautner
a211d2c4e6 am 4c4b1d65: Merge "Fix build due to bad javadoc link." 
* commit '4c4b1d65ff65ec2a6b45047ff24284989dbeb8b7':
  Fix build due to bad javadoc link.
 2014-04-04 02:03:23 +00:00
Craig Mautner
4c4b1d65ff Merge "Fix build due to bad javadoc link." 2014-04-04 01:57:47 +00:00
Craig Mautner
529a43f719 Fix build due to bad javadoc link. 
Change-Id: I83ca32611fb72b79be271dc3a5bd848934e9174f
 2014-04-03 18:54:52 -07:00
Craig Mautner
4722c9daaa am eb6387c1: Merge "Add the persistable attribute for Activities" 
* commit 'eb6387c16149e4d84dcb15427bb7ca8d0495554d':
  Add the persistable attribute for Activities
 2014-04-03 20:56:55 +00:00
Craig Mautner
eb6387c161 Merge "Add the persistable attribute for Activities" 2014-04-03 20:51:22 +00:00
Craig Mautner
fab55569c6 am 35fc6a02: Merge "Implement setActivityLabelAndIcon()." 
* commit '35fc6a02aeded9578375af5828e14043164028d5':
  Implement setActivityLabelAndIcon().
 2014-04-03 20:46:22 +00:00
Craig Mautner
35fc6a02ae Merge "Implement setActivityLabelAndIcon()." 2014-04-03 20:37:29 +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
5b29309b9a am ef4c0c9f: Merge "Move most TransformationInfo properties to RenderNode" 
* commit 'ef4c0c9fd5db395b2eea0a246b93bce9cc9e859a':
  Move most TransformationInfo properties to RenderNode
 2014-04-03 17:20:38 +00:00
Raph Levien
dcc2fa8028 am 537be409: am c333381b: am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements" 
* commit '537be409f281d4a872cbcebb6ac3a4d767ded4da':
  Marquee text RTL improvements
 2014-04-03 17:16:22 +00: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
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
c420ce34ba Merge "Marquee text RTL improvements" 2014-04-03 15:50:29 +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
369a00574d Merge "Update ViewRootImpl for 64bit functor type." 2014-04-03 09:48:43 +00:00
Jeff Brown
b1689744f0 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:40:51 +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 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
6909478e7e 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:39:26 +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
9a412c6fb2 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:18:45 +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
7e2d17a271 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:59 +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
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
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
Alan Viverette
bbabf55b85 am 1970f570: Don\'t use TypedArray after recycling it 
* commit '1970f570714a4746bf592e26731ea0ee8933d363':
  Don't use TypedArray after recycling it
 2014-04-02 23:53:45 +00:00
Alan Viverette
1970f57071 Don't use TypedArray after recycling it 
BUG: 13771701
Change-Id: Ib3ccb270f44cd236ce5294f8d0e01f1922005a3b
 2014-04-02 16:46:31 -07:00
Jinsuk Kim
60b17cc094 Use build property for CEC device OSD name 
Previously OSD name was based on device type. This CL makes it
independent of device type. CEC spec says "A device that implements
more than one type of CEC functionality should respond with the same
OSD name for each logical address. It is recommended that the name
refers to the complete physical product rather than the individual
CEC functionality".

Now the default name comes from system build property. I removed
setOsdName() from aidl for now since it won't be in use.

Change-Id: I3c9fb877fad4bc5efef56268d155a3f37a865fc2
 2014-04-03 07:59:27 +09:00
Jinsuk Kim
4c963841db am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev 
* commit 'b1dca1624dc8d853a52d1918c7672173e9b79836':
  Maintain display power status for playback device
 2014-04-02 22:43:52 +00:00
Jinsuk Kim
b1dca1624d Merge "Maintain display power status for playback device" into klp-modular-dev 2014-04-02 22:39:41 +00:00
Alan Viverette
01cefbc5b3 am b325345e: Merge "Switch framework Holo references to Quantum.Light" 
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
  Switch framework Holo references to Quantum.Light
 2014-04-02 22:23:17 +00:00
Alan Viverette
b325345ef0 Merge "Switch framework Holo references to Quantum.Light" 2014-04-02 22:15:16 +00:00
Dave Platt
9d50674496 am db89fe2a: Merge "Document and enforce "one request per Listener" rule" 
* commit 'db89fe2a2b7932f013f7a2dd136324c3daeee253':
  Document and enforce "one request per Listener" rule
 2014-04-02 21:17:13 +00:00
Dave Platt
db89fe2a2b Merge "Document and enforce "one request per Listener" rule" 2014-04-02 21:09:43 +00:00
John Reck
9eba8f98ba am a8b93711: Merge "Revert "Force-enable hardware acceleration for apps"" 
* commit 'a8b937115ac3bf047c8fc6c750f052fd633c5dd8':
  Revert "Force-enable hardware acceleration for apps"
 2014-04-02 18:09:06 +00:00
John Reck
a8b937115a Merge "Revert "Force-enable hardware acceleration for apps"" 2014-04-02 18:03:49 +00:00
John Reck
dd58e797aa Revert "Force-enable hardware acceleration for apps" 
This reverts commit 2a09011074.

Change-Id: I47c58b7251411432bd6a3eeb6fe567385b1c084f
 2014-04-02 16:54:28 +00:00
Paul Lawrence
e51dcf98a4 Save OwnerInfo so CryptKeeper can display at boot time 
Requires vold change from
  https://googleplex-android-review.git.corp.google.com/#/c/435164/

Bug: 13526708
Change-Id: I33153df9961832f72c3b8103bd5e1d3a17e77df3
 2014-04-02 07:16:05 -07:00
Ben Murdoch
cf61c9b71f Update ViewRootImpl for 64bit functor type. 
Change-Id: Ie9020f0276c58ebf0977e4aef725fbc26aaf67b2
 2014-04-02 14:41:41 +01:00
Kenny Guy
11b169e23c am 1ccace91: Merge "Rename related users to profiles." 
* commit '1ccace916c8fdc61f1a8db6677aed518d31647e6':
  Rename related users to profiles.
 2014-04-02 13:12:02 +00:00
Kenny Guy
1ccace916c Merge "Rename related users to profiles." 2014-04-02 13:06:28 +00:00
Kenny Guy
2a764949c9 Rename related users to profiles. 
Rename the related user concept as profiles.
When returning profiles of a user include the
user as a profile of itself.

Change-Id: Id5d4f29017b7ca6844632ce643f10331ad733e1d
 2014-04-02 13:44:50 +01:00
Narayan Kamath
f67783a474 am b69bb445: resolved conflicts for merge of 71ab4f4f to master 
* commit 'b69bb445585a083b8e4ff8a13a1a1a63e9c22a6a':
  Move zygote startup logic to the frameworks.
 2014-04-02 11:05:03 +00:00