OSDN Git Service
Tim Kilbourn [Tue, 25 Mar 2014 17:13:02 +0000 (10:13 -0700)]
Fix NPE when inflating GradientDrawables.
Change-Id: If624d6efac61dabe6009ee4368ad7b119e1d4dcd
Przemyslaw Szczepaniak [Tue, 25 Mar 2014 10:40:18 +0000 (10:40 +0000)]
Merge "Documentation update for TextToSpeech#getFeatures"
Yohann Roussel [Tue, 25 Mar 2014 09:38:42 +0000 (09:38 +0000)]
Merge "Add one test application for multidex."
Alan Viverette [Tue, 25 Mar 2014 02:55:27 +0000 (02:55 +0000)]
Merge "Unhide touch feedback drawable and wrapper"
Alan Viverette [Tue, 25 Mar 2014 02:54:34 +0000 (19:54 -0700)]
Unhide touch feedback drawable and wrapper
Change-Id: I98926d4adfb6e8c6130b31c8f4534a1a382d0f3b
Michael Wright [Tue, 25 Mar 2014 01:48:06 +0000 (01:48 +0000)]
Merge "Respect ACTION_CANCEL for joystick fallbacks"
Alan Viverette [Tue, 25 Mar 2014 01:26:15 +0000 (01:26 +0000)]
Merge "Implement APIs for obtaining, caching themed Drawables"
Alan Viverette [Tue, 25 Mar 2014 01:00:26 +0000 (18:00 -0700)]
Implement APIs for obtaining, caching themed Drawables
When Drawables are inflated during preload (or otherwise without a theme)
they cache their themeable attributes in their constant state as an array
keyed on attribute index. Drawables inflated with a theme will simply
resolve theme attributes as part of normal inflation, and they will not
cache any themeable attributes.
Drawables obtained from Resources are pulled from theme-specific cache
when possible. If an unthemed Drawable exists in the preload cache, a
new constant state will be obtained for the Drawable and the theme will
be applied by resolving the cached themeable attributes and overwriting
their respective constant state properties. If no cached version exists,
a new Drawable is inflated against the desired theme.
Constant states from themed drawables may be cached if the applied theme
is "pure" and was loaded from a style resource without any subsequent
modifications.
This CL does not handle applying themes to several Drawable types, but it
fully supports BitmapDrawable, GradientDrawable, NinePatchDrawable,
ColorDrawable, and TouchFeedbackDrawable.
BUG:
12611005
Change-Id: I4e794fbb62f7a371715f4ebdf946ee5f9a5ad1c9
Michael Wright [Wed, 19 Mar 2014 18:51:26 +0000 (11:51 -0700)]
Respect ACTION_CANCEL for joystick fallbacks
Also change MotionEvent.PointerCoords bit packing and unpacking
methods to be consistent with BitSets which are now used on the
native PointerCoords object.
Bug:
11480300
Change-Id: Ic6c7ebda5c545d07ea1ed259ca1f1184ccf85f29
Chong Zhang [Tue, 25 Mar 2014 00:32:17 +0000 (00:32 +0000)]
am
2ac81ee6: (-s ours) am
c4e6233b: am
b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit
* commit '
2ac81ee6ba51708d5504db5762ef44aafefc6ee2':
DO NOT MERGE change Surface constructor arg to 64bit
Chong Zhang [Tue, 25 Mar 2014 00:26:11 +0000 (00:26 +0000)]
am
c4e6233b: am
b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit
* commit '
c4e6233b2097dbd23927a9a247229ab67f41e4f8':
DO NOT MERGE change Surface constructor arg to 64bit
Winson Chung [Tue, 25 Mar 2014 00:24:14 +0000 (00:24 +0000)]
Merge "Fixing issue where we were relaunching each activity from recents instead of bringing them to the front."
Winson Chung [Tue, 25 Mar 2014 00:22:30 +0000 (17:22 -0700)]
Fixing issue where we were relaunching each activity from recents instead of bringing them to the front.
Chong Zhang [Tue, 25 Mar 2014 00:20:03 +0000 (00:20 +0000)]
am
b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit
* commit '
b68d38e81fd779011e478dcf9911fbe77f71f20e':
DO NOT MERGE change Surface constructor arg to 64bit
Ruben Brunk [Tue, 25 Mar 2014 00:12:21 +0000 (00:12 +0000)]
Merge "camera3: Update whiteLevel/greenSplit docs."
Ruben Brunk [Tue, 25 Mar 2014 00:10:35 +0000 (17:10 -0700)]
camera3: Update whiteLevel/greenSplit docs.
Bug:
13191430
Change-Id: I61cab65da546bdf1a748f46c28b6fce218b27bc4
Winson Chung [Mon, 24 Mar 2014 23:03:37 +0000 (23:03 +0000)]
Merge "Moving task view layout into resource."
Winson Chung [Mon, 24 Mar 2014 21:53:07 +0000 (14:53 -0700)]
Moving task view layout into resource.
- Using new activity icon/labels
Change-Id: If27bf60d2df75813213e9f3095baeb03085da8f7
John Spurlock [Mon, 24 Mar 2014 22:54:20 +0000 (22:54 +0000)]
am
c3b7a671: (-s ours) am
e2cae0a6: am
2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev
* commit '
c3b7a6718290dfc0cbd63039e76292f2ba35e43b':
Unhide Notification kind, rename to category.
John Reck [Mon, 24 Mar 2014 22:43:49 +0000 (15:43 -0700)]
Add back clobbered cleanup
Change-Id: I418b612710850bbc3033c4bd0143fb0f0befd2cb
Jose Lima [Mon, 24 Mar 2014 22:35:08 +0000 (22:35 +0000)]
Merge "resolved conflicts for merge of
6c45157c to master"
John Reck [Mon, 24 Mar 2014 22:34:46 +0000 (22:34 +0000)]
Merge "Add stagingProperties"
Jose Lima [Mon, 24 Mar 2014 22:33:25 +0000 (15:33 -0700)]
resolved conflicts for merge of
6c45157c to master
Change-Id: I95d7f927f4321405318b44a21172b99f3f16e00a
John Reck [Thu, 20 Mar 2014 23:28:56 +0000 (16:28 -0700)]
Add stagingProperties
Change-Id: Ic7de551f8843fd70a77f738e33028e25c020bb3c
Ricardo Cervera [Wed, 12 Mar 2014 16:15:06 +0000 (09:15 -0700)]
docs: Added new sensor types. Bug:
10674725
Original SHA-1: Ib378e3a1b3f1812b966c53a0eda6319f1bea464b
Original Conflicts:
docs/html/guide/topics/sensors/sensors_motion.jd
Change-Id: I8f8632410b2756174ea4dfab8d58486e58cd8db2
Dianne Hackborn [Mon, 24 Mar 2014 21:53:39 +0000 (14:53 -0700)]
Fix build.
Change-Id: I1dd79e932a551bd537d2c71e8fca29a299c9312f
Mark Renouf [Mon, 24 Mar 2014 21:25:41 +0000 (21:25 +0000)]
am
7390d4ab: am
3796594c: am
a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev
* commit '
7390d4ab8d12d5ffa5d28341096f4425247204a0':
Run finalizers before counting for StrictMode.
Craig Mautner [Mon, 24 Mar 2014 21:25:37 +0000 (21:25 +0000)]
am
5332706b: am
b98ee1eb: am
103ed355: am
557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."
* commit '
5332706b87c8772b97198e30c7cb4cc4ef3b577f':
Set ScreenshotSurface secure if any secure content is shown.
Jinsuk Kim [Mon, 24 Mar 2014 21:25:21 +0000 (21:25 +0000)]
am
775a097f: am
3c34e5db: am
c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
* commit '
775a097f01a349548d2124ae9d7dd562c72eaa27':
Add HdmiCecManager
Chris Craik [Mon, 24 Mar 2014 21:22:35 +0000 (21:22 +0000)]
Merge "Rework Outline API, remove isolatedZVolume remnants"
Chong Zhang [Wed, 29 Jan 2014 20:52:15 +0000 (12:52 -0800)]
DO NOT MERGE change Surface constructor arg to 64bit
Bug:
12799017
Bug:
12799384
Change-Id: Ic16b4fa5394df38cee0378b6e00d1808b9c8cb94
(cherry picked from commit
af608e81d450b962a443a21fb1a6feadeb355fe1)
Craig Mautner [Mon, 24 Mar 2014 20:52:13 +0000 (20:52 +0000)]
Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs"
Dianne Hackborn [Mon, 24 Mar 2014 20:42:30 +0000 (20:42 +0000)]
Merge "Battery stats: wake locks, radio active, cleanup."
Dianne Hackborn [Mon, 24 Mar 2014 20:36:46 +0000 (13:36 -0700)]
Battery stats: wake locks, radio active, cleanup.
- Improve wake lock work source updates to also update the current
history tag, in case the new work source gets recorded in the
history.
- Fix bug in recording radio active time that was not distributing
any time to apps.
- No longer hold a wake lock while dispatching data conn active call,
since it comes with its own timestamp.
- Fix issue where the top app was not being cleared while the screen
was off.
- Remove obsolete STATS_LAST stats type.
- Fix bug that was not clearing the total run time when resetting
the stats.
Change-Id: Iabe17a9edf34f762374ae09fcffb8a819cf72e30
Will Haldean Brown [Mon, 24 Mar 2014 20:23:42 +0000 (13:23 -0700)]
Update current.txt for offset attributes.
Change-Id: I0f88a6f327edfc207c081e424e3c97edd1451c90
quddusc [Mon, 24 Mar 2014 19:36:50 +0000 (19:36 +0000)]
am
87eac093: am
5771d425: am
5b2e92e3: am
529d47ac: am
e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
* commit '
87eac09358a49473549fa30e4acbf93c66b8915e':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
quddusc [Mon, 24 Mar 2014 19:36:45 +0000 (19:36 +0000)]
am
ce6307d3: am
3ee70ca4: am
9c1eaeb0: am
ff2599f9: am
0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
* commit '
ce6307d3c84ebf200e35cabf70cf49712ac14e04':
docs: Added Javadoc for Gcore Jarlsberg release.
Selim Cinek [Mon, 24 Mar 2014 19:36:14 +0000 (19:36 +0000)]
am
38fc02d4: am
d9e5761a: am
04ea3ca0: am
50ac19e9: am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
38fc02d4efa9e943ab38306d466c5fe2786f1bb7':
Disable Set Wallpaper button while loading image
Chad Brubaker [Mon, 24 Mar 2014 19:35:25 +0000 (19:35 +0000)]
am
51e93804: am
05e4dc96: am
850eb678: am
eb3c0d9a: am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
51e938041e72f29c4e776a8627ea9d8a70d62728':
Fix support for simultaneous VPN tuns
Chad Brubaker [Mon, 24 Mar 2014 19:35:20 +0000 (19:35 +0000)]
am
7f623d6b: am
9506e84b: am
c7726147: am
1fce89d9: am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
7f623d6b9459bc982c49f0a74aa2c9911f8e1dd8':
Include the interface for clearDnsInterfaceForUidRange
Ricardo Cervera [Mon, 24 Mar 2014 19:35:11 +0000 (19:35 +0000)]
am
1575e1a1: (-s ours) am
419b17ec: am
1d77a874: am
588300cb: am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
1575e1a1f5c6a0e1d870af88cba8d54023dfbcab':
docs: Added new sensor types. Bug:
10674725
Chris Wren [Mon, 24 Mar 2014 18:57:06 +0000 (18:57 +0000)]
Merge "add more dump info for heads up notifications"
John Reck [Mon, 24 Mar 2014 18:44:01 +0000 (18:44 +0000)]
am
02e99e27: am
ae316643: am
aff40e25: am
fc603ca6: am
abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit '
02e99e272dbfedf5d9ba1ae91fa2b83cab5b3d07':
Eliminate mHasAlpha
Dianne Hackborn [Mon, 24 Mar 2014 18:37:50 +0000 (18:37 +0000)]
Merge "Fix issue #
13564072: Back button no longer dismisses IME after voice usage"
Dianne Hackborn [Mon, 24 Mar 2014 18:37:18 +0000 (18:37 +0000)]
Merge "Get rid of not specifying a user errors in bluetooth."
Chris Craik [Thu, 20 Mar 2014 19:44:20 +0000 (12:44 -0700)]
Rework Outline API, remove isolatedZVolume remnants
Change-Id: I30c2fe832dcb98fa6329b1a595b3d3aafbdcad6b
Dianne Hackborn [Mon, 24 Mar 2014 18:27:18 +0000 (11:27 -0700)]
Fix issue #
13564072: Back button no longer dismisses IME after voice usage
Calling identity wasn't being cleared in an incoming code path.
Change-Id: Ib32060a91bf81531de049fafde69835b5382a25f
John Spurlock [Mon, 24 Mar 2014 17:51:01 +0000 (17:51 +0000)]
am
e2cae0a6: am
2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev
* commit '
e2cae0a6578596f9c87b970650a9cc234b32cb04':
Unhide Notification kind, rename to category.
John Spurlock [Mon, 24 Mar 2014 17:44:53 +0000 (17:44 +0000)]
am
2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev
* commit '
2b45d84e24946d0cbbcc577ca3e195c0db687c9a':
Unhide Notification kind, rename to category.
John Spurlock [Mon, 24 Mar 2014 17:38:44 +0000 (17:38 +0000)]
Merge "Unhide Notification kind, rename to category." into klp-modular-dev
Unsuk Jung [Mon, 24 Mar 2014 17:34:22 +0000 (17:34 +0000)]
am
8ae2ce76: am
7bde0fc7: am
2270ac96: am
8114c3d0: am
1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '
8ae2ce76e3d44f9b25f8121c693a1e21fef3bbe0':
Change wallpaper sizing
Will Haldean Brown [Mon, 24 Mar 2014 17:34:18 +0000 (17:34 +0000)]
am
ede2a729: am
ccd55a92: am
f8c78b50: Update current.txt to include windowSwipeToDismiss
* commit '
ede2a729c394461e5b3ea674e4762e7e6feed81d':
Update current.txt to include windowSwipeToDismiss
Alex Klyubin [Mon, 24 Mar 2014 17:34:11 +0000 (17:34 +0000)]
am
7ae93b1d: am
92ec0a0c: am
d8c32164: am
88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit '
7ae93b1d0cd1eb43b5fc8248dfc2703608a461f3':
Adjust to the change in the private SSLParameterImpl API.
Jeff Sharkey [Mon, 24 Mar 2014 17:34:02 +0000 (17:34 +0000)]
am
b8846c81: am
cf0c4a59: am
4868da52: am
c620ec36: am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
b8846c819e43535250b004dde593892fa305b7e7':
Lock down MANAGE_DOCUMENTS permission.
Will Haldean Brown [Mon, 24 Mar 2014 17:33:58 +0000 (17:33 +0000)]
am
d3e33cc2: am
aa0fa8eb: am
cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS.
* commit '
d3e33cc25d638cced9c17822db21e6c32e00f461':
Fix link in documentation for SWIPE_TO_DISMISS.
Will Haldean Brown [Mon, 24 Mar 2014 17:33:55 +0000 (17:33 +0000)]
am
e3d4f6c1: (-s ours) am
8f2c3252: am
496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev
* commit '
e3d4f6c19bb21dd20d95446def9a8872ecab2721':
Make windowSwipeToDismiss a public attribute.
Will Haldean Brown [Thu, 20 Mar 2014 23:31:48 +0000 (16:31 -0700)]
Make windowSwipeToDismiss a public attribute.
resolved conflicts for merge of
e3d4f6c1 to master
Bug:
13348970
Change-Id: I695139376fc7f38b3438ab38659ca15490ce8f7c
George Mount [Mon, 24 Mar 2014 16:47:08 +0000 (16:47 +0000)]
Merge "Fix null ActivityOptions when starting an Activity in a new Process."
George Mount [Mon, 24 Mar 2014 16:46:59 +0000 (16:46 +0000)]
Merge "Fix problem on Animator with a start delay."
Jose Lima [Mon, 24 Mar 2014 15:59:36 +0000 (15:59 +0000)]
am
d13d7016: am
eb2c85df: Merge "Added isGame application tag to the manifest" into klp-modular-dev
* commit '
d13d701681220cdcb61b5a62669e88bb77d156aa':
Added isGame application tag to the manifest
Jose Lima [Mon, 24 Mar 2014 15:53:24 +0000 (15:53 +0000)]
am
eb2c85df: Merge "Added isGame application tag to the manifest" into klp-modular-dev
* commit '
eb2c85df4b2d8ea5dd3cd08cb0367d5ff666afe6':
Added isGame application tag to the manifest
Jose Lima [Mon, 24 Mar 2014 15:49:17 +0000 (15:49 +0000)]
Merge "Added isGame application tag to the manifest" into klp-modular-dev
Mark Renouf [Mon, 24 Mar 2014 15:33:12 +0000 (15:33 +0000)]
am
3796594c: am
a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev
* commit '
3796594cd76238c46dd79a990ae1797f197dea85':
Run finalizers before counting for StrictMode.
Mark Renouf [Mon, 24 Mar 2014 15:27:45 +0000 (15:27 +0000)]
am
a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev
* commit '
a63cd9f424d70a3f8ca059aa8f76b28be1f9fa07':
Run finalizers before counting for StrictMode.
Mark Renouf [Mon, 24 Mar 2014 15:22:55 +0000 (15:22 +0000)]
Merge "Run finalizers before counting for StrictMode." into klp-modular-dev
Przemyslaw Szczepaniak [Mon, 24 Mar 2014 15:07:03 +0000 (15:07 +0000)]
Documentation update for TextToSpeech#getFeatures
Added note that it may return null in case of error.
Bug:
12323454
Change-Id: I246f7e894c5e8a6421bdd72c7623c72e8a13fc3a
John Spurlock [Mon, 24 Mar 2014 15:02:36 +0000 (11:02 -0400)]
Unhide Notification kind, rename to category.
Change-Id: I8e6d5a30dff519d7ed4f38e018646dd2bc55db33
Craig Mautner [Mon, 24 Mar 2014 14:44:17 +0000 (14:44 +0000)]
am
b98ee1eb: am
103ed355: am
557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."
* commit '
b98ee1eb50389520fd06255fd38b233c7adf5814':
Set ScreenshotSurface secure if any secure content is shown.
Craig Mautner [Mon, 24 Mar 2014 14:38:33 +0000 (14:38 +0000)]
am
103ed355: am
557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."
* commit '
103ed3558764f1fd41c9a5399e2030baa4110bfb':
Set ScreenshotSurface secure if any secure content is shown.
Craig Mautner [Mon, 24 Mar 2014 14:34:59 +0000 (07:34 -0700)]
am
557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."
* commit '
557a93e104f1fec69ed05b2d0ff26c78bca4c5d6':
Set ScreenshotSurface secure if any secure content is shown.
Craig Mautner [Mon, 24 Mar 2014 14:31:38 +0000 (14:31 +0000)]
Merge "Set ScreenshotSurface secure if any secure content is shown."
Jinsuk Kim [Mon, 24 Mar 2014 12:34:15 +0000 (12:34 +0000)]
am
3c34e5db: am
c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
* commit '
3c34e5dbbb99d3d66f71eea5db6e001cc5495263':
Add HdmiCecManager
Jinsuk Kim [Mon, 24 Mar 2014 12:26:51 +0000 (12:26 +0000)]
am
c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
* commit '
c01e1aeb0d86bd626684c97d709d4a8e995fddfb':
Add HdmiCecManager
Yohann Roussel [Thu, 26 Sep 2013 16:03:17 +0000 (18:03 +0200)]
Add one test application for multidex.
This application is intended to be run by
SupportMultidexHostTest.
Change-Id: Icace956cd68e03735fd8c73f877d911f01098f54
Przemyslaw Szczepaniak [Mon, 24 Mar 2014 10:08:36 +0000 (10:08 +0000)]
Merge "Do not reset language in case of the TTS service reconnect."
Mathew Inwood [Mon, 24 Mar 2014 09:46:22 +0000 (09:46 +0000)]
Merge "Fix log spam from View.toString()."
Jinsuk Kim [Sun, 23 Mar 2014 23:24:44 +0000 (23:24 +0000)]
Merge "Add HdmiCecManager" into klp-modular-dev
Jinsuk Kim [Fri, 21 Mar 2014 07:25:13 +0000 (16:25 +0900)]
Add HdmiCecManager
Introduces HdmiCecManager/HdmiCecClient to provide apps/system components
with the way to access HdmiCecService via Context.getSystemService(HDMI_CEC_SERVICE).
Change-Id: I39da071a328074a4b7b049947943688bd7779c26
Craig Mautner [Sun, 23 Mar 2014 01:20:41 +0000 (01:20 +0000)]
Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks.""
Craig Mautner [Sun, 23 Mar 2014 00:10:33 +0000 (00:10 +0000)]
Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."
This reverts commit
f7ad855718dc576a1618a54035b82e92356aa0d8.
After careful consideration this would prove to be a security leak to leave it in. Tasks could deliberately launch dialog activities that don't want to be seen in an unsecure setting. These would then be visible over the task background.
Change-Id: Ia7e984bc9616573af6c7772f6ea0f2dd588bb85d
Craig Mautner [Sat, 22 Mar 2014 23:44:37 +0000 (23:44 +0000)]
Merge "Add Activity methods for icons and labels."
Craig Mautner [Fri, 21 Mar 2014 16:34:07 +0000 (09:34 -0700)]
Add Activity methods for icons and labels.
New Activity methods setRecentsLabel(CharSequence) and
setRecentsIcon(Bitmap) have been added. The topmost
activity with either of these set will be returned in
RecentTaskInfo members activityLabel and activityIcon.
Fixes bug
13562992.
Change-Id: Ic15d1d27b733b892a2a940063b105ac48f1ffee5
quddusc [Sat, 22 Mar 2014 09:41:12 +0000 (09:41 +0000)]
am
5771d425: am
5b2e92e3: am
529d47ac: am
e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
* commit '
5771d42544ddc46f82c1b793d361df30c6fc90bf':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
quddusc [Sat, 22 Mar 2014 09:41:08 +0000 (09:41 +0000)]
am
3ee70ca4: am
9c1eaeb0: am
ff2599f9: am
0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
* commit '
3ee70ca452b3f0bf9482b6c18d18b9c03be07422':
docs: Added Javadoc for Gcore Jarlsberg release.
quddusc [Sat, 22 Mar 2014 09:30:56 +0000 (09:30 +0000)]
am
5b2e92e3: am
529d47ac: am
e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
* commit '
5b2e92e37b41b1497b240d41df471081c9dfdc56':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
quddusc [Sat, 22 Mar 2014 09:30:42 +0000 (09:30 +0000)]
am
9c1eaeb0: am
ff2599f9: am
0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
* commit '
9c1eaeb0b4f942b2163175c846e1c08ed4b14cbf':
docs: Added Javadoc for Gcore Jarlsberg release.
quddusc [Sat, 22 Mar 2014 04:09:04 +0000 (04:09 +0000)]
am
529d47ac: am
e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
* commit '
529d47ace907c9d961e2c1fb2e4e68ff24833e72':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
quddusc [Sat, 22 Mar 2014 04:08:59 +0000 (04:08 +0000)]
am
ff2599f9: am
0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
* commit '
ff2599f9b2f25179cad9631181216f2d24255901':
docs: Added Javadoc for Gcore Jarlsberg release.
John Spurlock [Sat, 22 Mar 2014 01:35:46 +0000 (01:35 +0000)]
Merge "Add notification category for recommendations."
John Spurlock [Fri, 21 Mar 2014 17:30:57 +0000 (13:30 -0400)]
Add notification category for recommendations.
Change-Id: I3718b8273c3f901aee1b2c2cdc4fcdae25fadcad
Dianne Hackborn [Sat, 22 Mar 2014 00:26:19 +0000 (00:26 +0000)]
Merge "Battery stats: track actually running time"
quddusc [Sat, 22 Mar 2014 00:01:20 +0000 (00:01 +0000)]
am
e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
* commit '
e9863dbe0665d5ce6dd46d673034a488b7637aff':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
quddusc [Sat, 22 Mar 2014 00:01:16 +0000 (00:01 +0000)]
am
0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
* commit '
0802b4fb391eecf37626d3d57f5e07eeb32a3185':
docs: Added Javadoc for Gcore Jarlsberg release.
quddusc [Fri, 21 Mar 2014 23:55:42 +0000 (23:55 +0000)]
Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
quddusc [Fri, 21 Mar 2014 23:55:34 +0000 (23:55 +0000)]
Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
quddusc [Thu, 20 Mar 2014 21:31:35 +0000 (14:31 -0700)]
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
Change-Id: Idc5dc716aa92c752b8dcd1967958d9d46521dfa6
Christopher Tate [Fri, 21 Mar 2014 23:32:58 +0000 (23:32 +0000)]
Merge "Cap the size of app-defined permission trees"
George Mount [Thu, 20 Mar 2014 16:38:23 +0000 (09:38 -0700)]
Fix null ActivityOptions when starting an Activity in a new Process.
Bug
13563265
Change-Id: Ie56cd6d55f13dbf68bafb82ab4bd6b27fde60df6
Dianne Hackborn [Fri, 21 Mar 2014 18:07:11 +0000 (11:07 -0700)]
Battery stats: track actually running time
Use the uptime while creating the battery stats history to
generate a new event indicating when the CPU is actually running.
We can do this in combination with the new event reporting when
the CPU comes awake, looking at the difference between the
uptime and elapsed time at that point to determine when it last
when to sleep.
Also use this information to generate a new set of aggregated
states, the uptime caused by each wake reason.
Finally use new radio down timestamp to adjust the times we
compute for radio use. Note that this information is not (yet)
being used to adjust how these are recorded in the history.
Change-Id: I723b3b526c8e7d64de0cac9d1193e04132d5a3e4
George Mount [Fri, 21 Mar 2014 23:13:37 +0000 (16:13 -0700)]
Fix problem on Animator with a start delay.
Bug
13589060
Change-Id: I05b9421fa141466bdbfe19f1bd5d993fa23982cb