OSDN Git Service
Jorim Jaggi [Thu, 3 Apr 2014 19:07:39 +0000 (21:07 +0200)]
resolved conflicts for merge of
93160828 to master-lockscreen-dev
Change-Id: Ief6d6b8b8cc9ae2eb38442a3ba9ecae4637b75d6
Selim Cinek [Thu, 3 Apr 2014 17:58:46 +0000 (17:58 +0000)]
Merge "Enabled the new notification shade and improved expanding logic"
Chris Craik [Thu, 3 Apr 2014 17:20:10 +0000 (17:20 +0000)]
am
ef4c0c9f: Merge "Move most TransformationInfo properties to RenderNode"
* commit '
ef4c0c9fd5db395b2eea0a246b93bce9cc9e859a':
Move most TransformationInfo properties to RenderNode
Chris Craik [Thu, 3 Apr 2014 17:14:53 +0000 (17:14 +0000)]
Merge "Move most TransformationInfo properties to RenderNode"
Raph Levien [Thu, 3 Apr 2014 17:13:12 +0000 (17:13 +0000)]
am
537be409: am
c333381b: am
24a2f20f: am
c420ce34: Merge "Marquee text RTL improvements"
* commit '
537be409f281d4a872cbcebb6ac3a4d767ded4da':
Marquee text RTL improvements
Raph Levien [Thu, 3 Apr 2014 17:09:26 +0000 (17:09 +0000)]
am
c333381b: am
24a2f20f: am
c420ce34: Merge "Marquee text RTL improvements"
* commit '
c333381b4c1b46f13f75388099cafb740844c497':
Marquee text RTL improvements
Narayan Kamath [Thu, 3 Apr 2014 17:00:47 +0000 (17:00 +0000)]
am
c6f6ba32: am
71ae2bd4: am
f87b3a25: am
374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"
* commit '
c6f6ba3265d2b07649277682fd3ca0f9ce4d011a':
Remove ProcessState::mArgc,mArgV,mArgLen
Ben Murdoch [Thu, 3 Apr 2014 17:00:41 +0000 (17:00 +0000)]
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.
Selim Cinek [Fri, 28 Mar 2014 19:21:01 +0000 (20:21 +0100)]
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
Narayan Kamath [Thu, 3 Apr 2014 16:56:32 +0000 (16:56 +0000)]
am
71ae2bd4: am
f87b3a25: am
374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"
* commit '
71ae2bd42be21de6d25d1f8c52e3973c172462df':
Remove ProcessState::mArgc,mArgV,mArgLen
Ben Murdoch [Thu, 3 Apr 2014 16:56:24 +0000 (16:56 +0000)]
am
55da6228: (-s ours) am
14424043: am
369a0057: Merge "Update ViewRootImpl for 64bit functor type."
* commit '
55da62288dcec75c34721a59d71f917dcb8a62b4':
Update ViewRootImpl for 64bit functor type.
ztenghui [Thu, 3 Apr 2014 16:36:10 +0000 (16:36 +0000)]
am
a0a09e88: Merge "Clean up on VectorDrawable."
* commit '
a0a09e88ddd3292ec19cb2dcb1847348df3d16d1':
Clean up on VectorDrawable.
ztenghui [Thu, 3 Apr 2014 16:32:28 +0000 (16:32 +0000)]
Merge "Clean up on VectorDrawable."
Raph Levien [Thu, 3 Apr 2014 16:02:39 +0000 (16:02 +0000)]
am
24a2f20f: am
c420ce34: Merge "Marquee text RTL improvements"
* commit '
24a2f20fe64e893e28dc70b288e12567ff71019f':
Marquee text RTL improvements
Raph Levien [Thu, 3 Apr 2014 15:55:22 +0000 (15:55 +0000)]
am
c420ce34: Merge "Marquee text RTL improvements"
* commit '
c420ce34ba177cd959cbb9432e9597d377e6cee6':
Marquee text RTL improvements
Raph Levien [Thu, 3 Apr 2014 15:50:28 +0000 (15:50 +0000)]
Merge "Marquee text RTL improvements"
Narayan Kamath [Thu, 3 Apr 2014 14:11:34 +0000 (14:11 +0000)]
am
f87b3a25: am
374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"
* commit '
f87b3a25b928f145558f6f60183944f513878b63':
Remove ProcessState::mArgc,mArgV,mArgLen
Narayan Kamath [Thu, 3 Apr 2014 14:05:28 +0000 (14:05 +0000)]
am
374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"
* commit '
374db6c3792e9ed56230e09fee4742632ce8159a':
Remove ProcessState::mArgc,mArgV,mArgLen
Narayan Kamath [Thu, 3 Apr 2014 13:59:37 +0000 (13:59 +0000)]
Merge "Remove ProcessState::mArgc,mArgV,mArgLen"
Narayan Kamath [Fri, 28 Mar 2014 13:39:21 +0000 (13:39 +0000)]
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
Ben Murdoch [Thu, 3 Apr 2014 10:00:25 +0000 (10:00 +0000)]
am
14424043: am
369a0057: Merge "Update ViewRootImpl for 64bit functor type."
* commit '
14424043b9c20edf639004e05fe8e9264a2e66f5':
Update ViewRootImpl for 64bit functor type.
Ben Murdoch [Thu, 3 Apr 2014 09:54:33 +0000 (09:54 +0000)]
am
369a0057: Merge "Update ViewRootImpl for 64bit functor type."
* commit '
369a00574da218975718ce07ffe6abba5c17bf92':
Update ViewRootImpl for 64bit functor type.
Ben Murdoch [Thu, 3 Apr 2014 09:48:43 +0000 (09:48 +0000)]
Merge "Update ViewRootImpl for 64bit functor type."
Jeff Brown [Thu, 3 Apr 2014 08:41:20 +0000 (08:41 +0000)]
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.
Jeff Tinker [Thu, 3 Apr 2014 08:41:17 +0000 (08:41 +0000)]
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
Jeff Brown [Thu, 3 Apr 2014 08:31:33 +0000 (08:31 +0000)]
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.
Jeff Tinker [Thu, 3 Apr 2014 08:31:19 +0000 (08:31 +0000)]
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
Jeff Brown [Thu, 3 Apr 2014 03:25:02 +0000 (03:25 +0000)]
am
8db6d9af: Merge "Clean up certain state transitions in DreamService." into klp-modular-dev
* commit '
8db6d9af58b9b81dbd764acd3f6a379afb539bf6':
Clean up certain state transitions in DreamService.
Jeff Brown [Thu, 3 Apr 2014 03:20:01 +0000 (03:20 +0000)]
Merge "Clean up certain state transitions in DreamService." into klp-modular-dev
Jeff Brown [Thu, 3 Apr 2014 03:00:36 +0000 (20:00 -0700)]
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
Alan Viverette [Thu, 3 Apr 2014 02:38:22 +0000 (02:38 +0000)]
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
Alan Viverette [Thu, 3 Apr 2014 02:33:02 +0000 (02:33 +0000)]
Merge "Fix dialog style, selectable item bg pinning, and pressed state"
Alan Viverette [Thu, 3 Apr 2014 02:15:04 +0000 (19:15 -0700)]
Fix dialog style, selectable item bg pinning, and pressed state
BUG:
13746931
Change-Id: I31c2959f3e773a3aeb66ba5842d8d6fbb288acc1
Jinsuk Kim [Thu, 3 Apr 2014 02:17:08 +0000 (02:17 +0000)]
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
Jinsuk Kim [Thu, 3 Apr 2014 02:11:40 +0000 (02:11 +0000)]
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
Jinsuk Kim [Thu, 3 Apr 2014 01:44:31 +0000 (01:44 +0000)]
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
Katie McCormick [Thu, 3 Apr 2014 01:44:28 +0000 (01:44 +0000)]
am
62b7e66e: am
035a2bbd: am
85588d19: am
cd536cb3: am
0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
* commit '
62b7e66e0356810bd11931edf6c14959b70be996':
docs: MediaRouteProvider Developer Guide
Jinsuk Kim [Thu, 3 Apr 2014 01:44:24 +0000 (01:44 +0000)]
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
Christopher Tate [Thu, 3 Apr 2014 01:44:20 +0000 (01:44 +0000)]
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
Jinsuk Kim [Thu, 3 Apr 2014 01:41:24 +0000 (01:41 +0000)]
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
Katie McCormick [Thu, 3 Apr 2014 01:41:20 +0000 (01:41 +0000)]
am
035a2bbd: am
85588d19: am
cd536cb3: am
0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
* commit '
035a2bbd8b8720673e068cf06d646e616a10ab34':
docs: MediaRouteProvider Developer Guide
Jinsuk Kim [Thu, 3 Apr 2014 01:41:13 +0000 (01:41 +0000)]
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
Christopher Tate [Thu, 3 Apr 2014 01:39:36 +0000 (01:39 +0000)]
Merge "Refuse update of a system app if it changes its shared uid"
Chris Craik [Mon, 31 Mar 2014 19:34:11 +0000 (12:34 -0700)]
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
Jeff Tinker [Thu, 3 Apr 2014 01:35:28 +0000 (01:35 +0000)]
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
Jeff Tinker [Thu, 3 Apr 2014 01:30:42 +0000 (01:30 +0000)]
Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev
Jinsuk Kim [Thu, 3 Apr 2014 00:39:23 +0000 (00:39 +0000)]
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
Jinsuk Kim [Thu, 3 Apr 2014 00:35:09 +0000 (00:35 +0000)]
Merge "Use build property for CEC device OSD name" into klp-modular-dev
ztenghui [Wed, 2 Apr 2014 23:35:24 +0000 (16:35 -0700)]
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
Christopher Tate [Mon, 31 Mar 2014 21:22:06 +0000 (14:22 -0700)]
Refuse update of a system app if it changes its shared uid
Bug
13657183
Change-Id: I6d8fb9c8810ca896d2d10e5a80a3c4a50c9e4fed
Alan Viverette [Wed, 2 Apr 2014 23:51:27 +0000 (23:51 +0000)]
am
1970f570: Don\'t use TypedArray after recycling it
* commit '
1970f570714a4746bf592e26731ea0ee8933d363':
Don't use TypedArray after recycling it
Alan Viverette [Wed, 2 Apr 2014 23:46:31 +0000 (16:46 -0700)]
Don't use TypedArray after recycling it
BUG:
13771701
Change-Id: Ib3ccb270f44cd236ce5294f8d0e01f1922005a3b
Jeff Tinker [Wed, 2 Apr 2014 19:23:56 +0000 (12:23 -0700)]
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
Jinsuk Kim [Wed, 2 Apr 2014 23:17:23 +0000 (23:17 +0000)]
am
7b4c9725: Merge "Fix build breakage by updating current.txt" into klp-modular-dev
* commit '
7b4c972577179b2dfcf8a59c31b3730d097c5d46':
Fix build breakage by updating current.txt
Katie McCormick [Wed, 2 Apr 2014 23:17:20 +0000 (23:17 +0000)]
am
85588d19: am
cd536cb3: am
0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
* commit '
85588d19bd9fce3d7e837c14e0b9d50cf3a75904':
docs: MediaRouteProvider Developer Guide
Jinsuk Kim [Wed, 2 Apr 2014 23:12:09 +0000 (23:12 +0000)]
Merge "Fix build breakage by updating current.txt" into klp-modular-dev
Katie McCormick [Wed, 2 Apr 2014 23:11:20 +0000 (23:11 +0000)]
am
cd536cb3: am
0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
* commit '
cd536cb32927d74ac8181c8636f2971cb39e7fda':
docs: MediaRouteProvider Developer Guide
Jinsuk Kim [Wed, 2 Apr 2014 23:09:58 +0000 (08:09 +0900)]
Fix build breakage by updating current.txt
Change-Id: If9434850c24c8e97bdd49952fb3180d139cab101
Katie McCormick [Wed, 2 Apr 2014 23:05:04 +0000 (23:05 +0000)]
am
0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
* commit '
0cdf60472be5efc1b6e8ef125f96ba014870b345':
docs: MediaRouteProvider Developer Guide
Jinsuk Kim [Fri, 28 Mar 2014 02:46:04 +0000 (11:46 +0900)]
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
Katie McCormick [Wed, 2 Apr 2014 22:58:56 +0000 (22:58 +0000)]
Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
Jinsuk Kim [Wed, 2 Apr 2014 22:43:52 +0000 (22:43 +0000)]
am
b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev
* commit '
b1dca1624dc8d853a52d1918c7672173e9b79836':
Maintain display power status for playback device
Alan Viverette [Wed, 2 Apr 2014 22:43:07 +0000 (22:43 +0000)]
am
e3c38a0b: Fix recents theme, add missing headers
* commit '
e3c38a0b0ebefa0a86be944259467c8acc9e5e49':
Fix recents theme, add missing headers
Jinsuk Kim [Wed, 2 Apr 2014 22:39:41 +0000 (22:39 +0000)]
Merge "Maintain display power status for playback device" into klp-modular-dev
Alan Viverette [Wed, 2 Apr 2014 22:39:13 +0000 (15:39 -0700)]
Fix recents theme, add missing headers
Change-Id: Ib8eea6153eaf7e0e93e54c69fe59e63e98a409a6
Alan Viverette [Wed, 2 Apr 2014 22:37:23 +0000 (22:37 +0000)]
am
09ec3e30: Merge "Disable content transitions, they are not implemented yet"
* commit '
09ec3e30b71d0bd8d5b711ffd68fbeb27a0930fb':
Disable content transitions, they are not implemented yet
Joe Fernandez [Thu, 27 Mar 2014 06:11:31 +0000 (23:11 -0700)]
docs: MediaRouteProvider Developer Guide
Change-Id: I04e63a8972e29d67af6035462fd2808a562ac241
Alan Viverette [Wed, 2 Apr 2014 22:31:21 +0000 (22:31 +0000)]
Merge "Disable content transitions, they are not implemented yet"
Alan Viverette [Wed, 2 Apr 2014 22:18:59 +0000 (22:18 +0000)]
am
b325345e: Merge "Switch framework Holo references to Quantum.Light"
* commit '
b325345ef0adf2849350d339de1ec5f92b67b7ae':
Switch framework Holo references to Quantum.Light
Winson Chung [Wed, 2 Apr 2014 22:18:55 +0000 (22:18 +0000)]
am
ceb9b437: Merge "Adding system service proxy to help test UI/performance."
* commit '
ceb9b437f701f68411fcbef7e83b5df45834f9d9':
Adding system service proxy to help test UI/performance.
Alan Viverette [Wed, 2 Apr 2014 22:15:15 +0000 (22:15 +0000)]
Merge "Switch framework Holo references to Quantum.Light"
Winson Chung [Wed, 2 Apr 2014 22:14:19 +0000 (22:14 +0000)]
Merge "Adding system service proxy to help test UI/performance."
Alan Viverette [Wed, 2 Apr 2014 22:14:03 +0000 (15:14 -0700)]
Disable content transitions, they are not implemented yet
BUG:
13745751
Change-Id: I5d3c7c2f679084b7a161b7233e18264056eee211
Jorim Jaggi [Wed, 2 Apr 2014 21:22:58 +0000 (21:22 +0000)]
Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev
Alan Viverette [Wed, 2 Apr 2014 21:13:25 +0000 (21:13 +0000)]
am
8754b73b: Merge "Add inverse text styles to public"
* commit '
8754b73bf81aa0164f3e2a1a429ba0fda39202de':
Add inverse text styles to public
Dave Platt [Wed, 2 Apr 2014 21:13:21 +0000 (21:13 +0000)]
am
db89fe2a: Merge "Document and enforce "one request per Listener" rule"
* commit '
db89fe2a2b7932f013f7a2dd136324c3daeee253':
Document and enforce "one request per Listener" rule
Ben Cheng [Wed, 2 Apr 2014 21:13:18 +0000 (21:13 +0000)]
am
0e2806b1: am
3399ec31: am
b386bfd7: am
89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
* commit '
0e2806b171f135de35153a106d18d86646f4d1c0':
Use default visibility for Snapshot::getLocalClip.
Alan Viverette [Wed, 2 Apr 2014 21:11:38 +0000 (21:11 +0000)]
Merge "Add inverse text styles to public"
Dave Platt [Wed, 2 Apr 2014 21:09:42 +0000 (21:09 +0000)]
Merge "Document and enforce "one request per Listener" rule"
Ben Cheng [Wed, 2 Apr 2014 21:07:25 +0000 (21:07 +0000)]
am
3399ec31: am
b386bfd7: am
89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
* commit '
3399ec317d8a318ca384036bc6fecf4656f1f118':
Use default visibility for Snapshot::getLocalClip.
Chris Wren [Wed, 2 Apr 2014 21:07:21 +0000 (21:07 +0000)]
am
af31a7d1: Merge "add variance to notification usage stats"
* commit '
af31a7d1cc26733f138119c43385aa86d0a3c04f':
add variance to notification usage stats
Chris Wren [Wed, 2 Apr 2014 21:03:00 +0000 (21:03 +0000)]
Merge "add variance to notification usage stats"
Ben Cheng [Wed, 2 Apr 2014 20:59:47 +0000 (20:59 +0000)]
am
b386bfd7: am
89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
* commit '
b386bfd791d77e24bcfe3261420f82b0a9d3851d':
Use default visibility for Snapshot::getLocalClip.
Chris Wren [Tue, 1 Apr 2014 17:57:34 +0000 (13:57 -0400)]
add variance to notification usage stats
Change-Id: I9b6abd08cf01a1d80c8e5dd581c8e82e019542fc
Ben Cheng [Wed, 2 Apr 2014 20:54:47 +0000 (20:54 +0000)]
am
89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
* commit '
89dddcc948cb3e826bfddeefae73066849aba0fc':
Use default visibility for Snapshot::getLocalClip.
Ben Cheng [Wed, 2 Apr 2014 20:50:59 +0000 (20:50 +0000)]
Merge "Use default visibility for Snapshot::getLocalClip."
Michael Wright [Wed, 2 Apr 2014 20:48:56 +0000 (20:48 +0000)]
am
ddbb0a3c: am
744cf2b9: (-s ours) am
4932a355: Merge "Misc. buttons aren\'t gamepad keys." into klp-modular-dev
* commit '
ddbb0a3c33a070a6337cdb17b1063eee545df1e8':
Misc. buttons aren't gamepad keys.
ztenghui [Wed, 2 Apr 2014 20:45:18 +0000 (20:45 +0000)]
am
2766e37d: Merge "Getting the version information into the VectorDrawable"
* commit '
2766e37d85eb4ae91095dc6822cce421473f08cb':
Getting the version information into the VectorDrawable
Michael Wright [Wed, 2 Apr 2014 20:45:00 +0000 (20:45 +0000)]
am
744cf2b9: (-s ours) am
4932a355: Merge "Misc. buttons aren\'t gamepad keys." into klp-modular-dev
* commit '
744cf2b98f3f643380ab1db53e3d2216ecf9d872':
Misc. buttons aren't gamepad keys.
ztenghui [Wed, 2 Apr 2014 20:39:46 +0000 (20:39 +0000)]
Merge "Getting the version information into the VectorDrawable"
Michael Wright [Wed, 2 Apr 2014 20:30:29 +0000 (20:30 +0000)]
am
4932a355: Merge "Misc. buttons aren\'t gamepad keys." into klp-modular-dev
* commit '
4932a355f1594990173e0d9cd1fa38b8491c4a29':
Misc. buttons aren't gamepad keys.
Michael Wright [Wed, 2 Apr 2014 20:26:36 +0000 (20:26 +0000)]
Merge "Misc. buttons aren't gamepad keys." into klp-modular-dev
Ben Cheng [Wed, 2 Apr 2014 19:45:57 +0000 (12:45 -0700)]
Use default visibility for Snapshot::getLocalClip.
The method is in libhwui.so but used by libandroid_runtime.so
(via android_view_GLES20Canvas.cpp). If the compiler decides not to
inline this method, the linker won't be able to resolve the dependency
when it has hidden visibility.
The problem is found when testing GCC 4.9.
Change-Id: I3b4d096c7767f0bef0796886dfb2c5ba2ecff48c
Jorim Jaggi [Mon, 31 Mar 2014 14:35:15 +0000 (16:35 +0200)]
Wait for Keyguard to be drawn after boot.
The old logic with waiting for the Keyguard to be drawn assumed that
it is in an own window, and just checked for the visibility. This is
no longer possible as the Keyguard is in the status bar, and the status
bar might have been drawn without the Keyguard. So we have to wait
explicitely until Keyguard told PhoneWindowManager that it has now been
drawn and we can turn on the screen.
In addition, the starting logic of SystemUI is moved into
SystemUIApplication such the we can make sure that the status bar
already exists when the callbacks from PhoneWindowManager reach
KeyguardService. This simplifies the logic a lot.
Bug:
13635952
Change-Id: Ifd6ba795647edcf3501641e39052e4d04bc826fb
Winson Chung [Wed, 2 Apr 2014 19:25:04 +0000 (12:25 -0700)]
Adding system service proxy to help test UI/performance.
Change-Id: I29851ff7b7ced0a69b041e5aa5c9070fc4ab43a5
Alan Viverette [Wed, 2 Apr 2014 18:34:19 +0000 (11:34 -0700)]
Add inverse text styles to public
Change-Id: I3c5e9e847d414e98d0d99380bd7407cb081cb524
Kenny Guy [Wed, 2 Apr 2014 18:28:35 +0000 (18:28 +0000)]
am
f4824a06: Fix issue with not allowing activities for current user.
* commit '
f4824a06884e096beef921646cba4be29d7f36fc':
Fix issue with not allowing activities for current user.
ztenghui [Mon, 31 Mar 2014 22:55:35 +0000 (15:55 -0700)]
Getting the version information into the VectorDrawable
This will allow version controling for later API improvement.
We will only support version 1 so far.
Change-Id: I322e63f6cff157ebb6df5d80625c39bf96ff3659
Kenny Guy [Wed, 2 Apr 2014 18:17:41 +0000 (19:17 +0100)]
Fix issue with not allowing activities for current user.
Change-Id: Ic2e30c3f4990a03aac9801ee9bf5f270a5e90ef8
John Reck [Wed, 2 Apr 2014 18:07:27 +0000 (18:07 +0000)]
am
a8b93711: Merge "Revert "Force-enable hardware acceleration for apps""
* commit '
a8b937115ac3bf047c8fc6c750f052fd633c5dd8':
Revert "Force-enable hardware acceleration for apps"