OSDN Git Service
Craig Mautner [Thu, 3 Apr 2014 20:37:29 +0000 (20:37 +0000)]
Merge "Implement setActivityLabelAndIcon()."
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:14:53 +0000 (17:14 +0000)]
Merge "Move most TransformationInfo properties to RenderNode"
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
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: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: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: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: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: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: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
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
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: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
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: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: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
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
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:03:49 +0000 (18:03 +0000)]
Merge "Revert "Force-enable hardware acceleration for apps""
John Reck [Wed, 2 Apr 2014 16:54:28 +0000 (16:54 +0000)]
Revert "Force-enable hardware acceleration for apps"
This reverts commit
2a0901107443685ef2f2a55d0b62ddcc6cf183ba.
Change-Id: I47c58b7251411432bd6a3eeb6fe567385b1c084f
Ben Murdoch [Wed, 2 Apr 2014 13:41:41 +0000 (14:41 +0100)]
Update ViewRootImpl for 64bit functor type.
Change-Id: Ie9020f0276c58ebf0977e4aef725fbc26aaf67b2
Christoph Studer [Wed, 2 Apr 2014 13:14:03 +0000 (13:14 +0000)]
Merge "Expose locations from NotifStackScrollLayout"
Kenny Guy [Wed, 2 Apr 2014 13:06:28 +0000 (13:06 +0000)]
Merge "Rename related users to profiles."
Christoph Studer [Tue, 1 Apr 2014 16:40:27 +0000 (18:40 +0200)]
Expose locations from NotifStackScrollLayout
Expose the position each child is rendered at from
NotificationStackScrollLayout.
Also add OnChildLocationsChangedListener interface so listeners
can be notified whenever the rendering changes.
Change-Id: Iab8706fc2c435f2ddf64d280f428ed562db94f19
Kenny Guy [Wed, 2 Apr 2014 12:29:20 +0000 (13:29 +0100)]
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
Narayan Kamath [Wed, 2 Apr 2014 10:50:57 +0000 (11:50 +0100)]
resolved conflicts for merge of
71ab4f4f to master
Change-Id: I888c231f7579523e12fbd68f820f0775019e51e0
Narayan Kamath [Wed, 2 Apr 2014 10:41:24 +0000 (10:41 +0000)]
am
ea9e5eca: am
17b1b8fe: Merge "Move zygote startup logic to the frameworks."
* commit '
ea9e5ecac1e5240370f0e3f998b9c8b159ee9320':
Move zygote startup logic to the frameworks.
Narayan Kamath [Wed, 2 Apr 2014 10:35:38 +0000 (10:35 +0000)]
am
17b1b8fe: Merge "Move zygote startup logic to the frameworks."
* commit '
17b1b8fe8c0c8f05f2077acc82428881bf591a78':
Move zygote startup logic to the frameworks.
Narayan Kamath [Wed, 2 Apr 2014 10:29:55 +0000 (10:29 +0000)]
Merge "Move zygote startup logic to the frameworks."
Narayan Kamath [Mon, 31 Mar 2014 12:41:26 +0000 (13:41 +0100)]
Move zygote startup logic to the frameworks.
The Zygote class is now in com.android.internal.os. It is
responsible for the vast majority of work before and after
the call to fork(). It calls back into the Runtime via
the new dalvik.system.ZygoteHooks class to allow the Runtime
to perform pre fork cleanup and post fork initialization.
The native code in Zygote.cpp is a direct and straightforward
port of the existing code in art. Most differences are
superficial, for example :
- We use C style logging (ALOGE) instead of stream based
logging.
- We call env->FatalError() instead of using LOG(FATAL)
Change-Id: Ia101fb2af12d23894fe57e4134d2bc6d142e5059
Jinsuk Kim [Mon, 24 Mar 2014 09:02:29 +0000 (18:02 +0900)]
Maintain display power status for playback device
With this CL, the power status of TV/display is keep tracked of
by hdmi cec server part, specfically HdmiCecDevicePlayback.
Turned the HdmiCecDevice to abstract class from which classes of
concrete device type(HdmiCecDevicePlayback, HdmiCecDeviceTV) are
inherited. The display power status code is put in HdmiCecDevicePlayback
only. HdmiCecDeviceTv will have its own logic that manages power status of
devices connected to it. For now it only has a bare minimum code.
Will be worked on in follow up CLs.
Other changes:
- Replaced sendGiveDevicePowerStatus() with isTvOn() so that the status
can be queried by clients.
- Defensively check the availability of HdmiCecService so that
HdmiCecManager.getClient() returns null in case the service couldn't
be initialized. This ensures clients of the service gets the nulled-out
HdmiCecClient when called in the state/configuration where the service
is not available, thus proceed accordingly.
Change-Id: Idaf69e73cfbd639c0b40b1bd4b6146f011246180
Ricardo Cervera [Wed, 2 Apr 2014 00:27:51 +0000 (00:27 +0000)]
am
04c2a557: am
c013eaad: am
5a218b18: am
8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
* commit '
04c2a5571620927f702af3707845b1b05769dc46':
docs: Added notes to use the last SDK version to the Build your First App class.
Ricardo Cervera [Wed, 2 Apr 2014 00:20:22 +0000 (00:20 +0000)]
am
c013eaad: am
5a218b18: am
8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
* commit '
c013eaad574bcb40152d90105d6fbc82293cbb11':
docs: Added notes to use the last SDK version to the Build your First App class.
Ricardo Cervera [Wed, 2 Apr 2014 00:15:31 +0000 (00:15 +0000)]
am
5a218b18: am
8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
* commit '
5a218b186735534925d7fedb63f1c78a3a3ff543':
docs: Added notes to use the last SDK version to the Build your First App class.
Ricardo Cervera [Wed, 2 Apr 2014 00:08:11 +0000 (00:08 +0000)]
am
8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
* commit '
8e183798d573ad4777a5f01fd6db8f86ca0e120f':
docs: Added notes to use the last SDK version to the Build your First App class.
Michael Kolb [Wed, 2 Apr 2014 00:03:29 +0000 (00:03 +0000)]
am
4a812147: am
875eff83: Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev
* commit '
4a8121478e5027bf61b5c711d6b1a748004edea2':
Add circular anti-aliasing mask to circular display
Ricardo Cervera [Wed, 2 Apr 2014 00:03:00 +0000 (00:03 +0000)]
Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
Christopher Tate [Tue, 1 Apr 2014 23:45:24 +0000 (23:45 +0000)]
Merge "Rejigger the invalid-key checks at backup time"
Christopher Tate [Tue, 1 Apr 2014 17:38:29 +0000 (10:38 -0700)]
Rejigger the invalid-key checks at backup time
Bug
13732002
Change-Id: Ic8f71234d1bbc7420eaa8e1762b999d09f308d46
Winson Chung [Tue, 1 Apr 2014 23:10:25 +0000 (23:10 +0000)]
Merge "Enabling filtering by base intent package."
Igor Murashkin [Tue, 1 Apr 2014 23:01:45 +0000 (23:01 +0000)]
Merge "camera2: Fix out-of-date metadata test"
Michael Kolb [Tue, 1 Apr 2014 22:54:30 +0000 (22:54 +0000)]
am
875eff83: Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev
* commit '
875eff832f9f496740ceba2f12de6f5423225274':
Add circular anti-aliasing mask to circular display
Wei Wang [Thu, 20 Mar 2014 18:30:58 +0000 (11:30 -0700)]
Use correct wifi batching parameter ranges.
Note these are slightly adjusted capabilities of N5.
Cherry pick.
Change-Id: Ia6888f6a5a69d135ff7e3c87d9744e18265fb3bf
Igor Murashkin [Tue, 1 Apr 2014 22:50:48 +0000 (15:50 -0700)]
camera2: Fix out-of-date metadata test
* The tag android.sensor.calibrationTransform1 was renamed
to android.sensor.calibrationTransform (1 removed)
Bug:
12002757
Change-Id: Ida0e37a30222f08d0d9bb3871717c74c21e428ac
Michael Kolb [Tue, 1 Apr 2014 22:48:27 +0000 (22:48 +0000)]
Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev
Michael Wright [Tue, 1 Apr 2014 22:43:43 +0000 (15:43 -0700)]
Misc. buttons aren't gamepad keys.
BUTTON_[1-9] are intended to be misc. buttons so the kernel will
assign them to non-gamepad devices. As such, we shouldn't treat them
as belonging to gamepads at all.
Bug:
13432364
Change-Id: I9495760f2379e44785b9ce1cf018b6db7f6cb0f4