OSDN Git Service
Scott Main [Tue, 25 Mar 2014 21:20:06 +0000 (21:20 +0000)]
am
f71eebdb: am
686f041e: am
77dc3c00: am
27fa561f: am
52f449fd: fix size and behavior of video thumbnail when flash not available
* commit '
f71eebdb22a251538a81c1fce8d5bf80ce5d7619':
fix size and behavior of video thumbnail when flash not available
Ricardo Cervera [Tue, 25 Mar 2014 21:19:53 +0000 (21:19 +0000)]
am
ba6bbb01: am
addeab5c: am
bd48af2c: am
cd64a9ba: am
399b9994: docs: Added release notes for Google APIs System Image v4.
* commit '
ba6bbb01d4f8b60c3c124797700122b717a2a5c4':
docs: Added release notes for Google APIs System Image v4.
Matthew Williams [Tue, 25 Mar 2014 21:19:49 +0000 (21:19 +0000)]
am
2c672973: (-s ours) am
4bcf922a: am
c798e4f5: am
4701b51a: am
bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit '
2c6729735290140959a7102afea3320d257d1f42':
DO NOT MERGE: Downgrade expedited to normal on reschedule.
Scott Main [Tue, 25 Mar 2014 21:19:42 +0000 (21:19 +0000)]
am
b8a79fce: am
941eabc2: am
e9b50e75: am
9d8184e7: am
779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions
* commit '
b8a79fcef37dba36733dc25064b40f706a13fc7a':
update wear homepage with layout fixes and replace GIFs with smaller versions
Selim Cinek [Tue, 25 Mar 2014 21:18:45 +0000 (21:18 +0000)]
am
50cd7c39: am
f7805dd7: am
7290b56b: am
8ae8689d: am
c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
* commit '
50cd7c39bb9f62d443a62d1f4af7f6ebc107f217':
Fixed wallpaper bug where wrong size was taken when cropping
Gabriel Peal [Tue, 25 Mar 2014 20:59:04 +0000 (20:59 +0000)]
Merge "resolved conflicts for merge of
c1edfc2c to master"
Zhijun He [Tue, 25 Mar 2014 20:54:55 +0000 (20:54 +0000)]
Merge "Camera2: Add partial flash state"
Gabriel Peal [Tue, 25 Mar 2014 20:49:51 +0000 (13:49 -0700)]
resolved conflicts for merge of
c1edfc2c to master
Change-Id: I95d690e5f0895c1dbfd911f345703f0f562be447
Zhijun He [Tue, 25 Mar 2014 20:49:30 +0000 (13:49 -0700)]
Camera2: Add partial flash state
Bug
13637334
Change-Id: Ife5d943851f3f47d33b05d7450765dd273eb1036
Adam Lesinski [Tue, 25 Mar 2014 20:49:08 +0000 (20:49 +0000)]
Merge "Shared library resource support"
Gabriel Peal [Wed, 19 Mar 2014 23:41:49 +0000 (16:41 -0700)]
resolved conflicts for merge of
c1edfc2c to master
attempt 2
Change-Id: Ic9e6e9e02c4781617deeea3ddcb4a0b2b659e4fc
Gabriel Peal [Tue, 25 Mar 2014 19:22:41 +0000 (19:22 +0000)]
Merge "resolved conflicts for merge of
c1edfc2c to master"
Gabriel Peal [Wed, 19 Mar 2014 23:41:49 +0000 (16:41 -0700)]
resolved conflicts for merge of
c1edfc2c to master
Change-Id: Ica42d8ac1552040f7ea2864ff529f5fc1470001b
Adam Lesinski [Thu, 30 Jan 2014 02:20:45 +0000 (18:20 -0800)]
Shared library resource support
Shared libraries can now export resources for applications
to use.
Exporting resources works the same way the framework exports
resources, by defining the public symbols in res/values/public.xml.
Building a shared library requires aapt to be invoked with the
--shared-lib option. Shared libraries will be assigned a package
ID of 0x00 at build-time. At runtime, all loaded shared libraries
will be assigned a new package ID.
Currently, shared libraries should not import other shared libraries,
as those dependencies will not be loaded at runtime.
At runtime, reflection is used to update the package ID of resource
symbols in the shared library's R class file. The package name of
the R class file is assumed to be the same as the shared library's
package name declared in its manifest. This will be customizable in
a future commit.
See /tests/SharedLibrary/ for examples of a shared library and its
client.
Bug:
12724178
Change-Id: I60c0cb8ab87849f8f8a1a13431562fe8603020a7
Baligh Uddin [Tue, 25 Mar 2014 18:56:41 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:56:32 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:56:24 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:56:22 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:56:18 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:52:33 +0000 (18:52 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:52:31 +0000 (18:52 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:52:29 +0000 (18:52 +0000)]
Merge "Import translations. DO NOT MERGE"
Gabriel Peal [Tue, 25 Mar 2014 18:32:22 +0000 (18:32 +0000)]
Merge "resolved conflicts for merge of
74fb97de to master"
Chris Craik [Tue, 25 Mar 2014 18:08:30 +0000 (18:08 +0000)]
Merge "Fix doc build"
Gabriel Peal [Fri, 21 Mar 2014 18:31:32 +0000 (11:31 -0700)]
resolved conflicts for merge of
74fb97de to master
Change-Id: If28dc21a2ea7e634da130f3c59c17cd63dd5336a
Chris Craik [Tue, 25 Mar 2014 18:06:58 +0000 (11:06 -0700)]
Fix doc build
Change-Id: I18627229be3e8e242e469af83e7e5ae580b03707
Jean-Michel Trivi [Tue, 25 Mar 2014 17:52:00 +0000 (17:52 +0000)]
Merge "Begin refactor of MediaFocusControl"
Jean-Michel Trivi [Fri, 21 Mar 2014 16:15:43 +0000 (09:15 -0700)]
Begin refactor of MediaFocusControl
Extract class that handles each entry in the remote control stack
and move it to another file, MediaController.java.
Rename RemoteControlStackEntry to MediaController as each instance
will not just encapsulate information about the corresponding
(if any) RemoteControlClient.
This is just a CL for the renaming and extraction into a new file
of existing code. Obvious required changes are labelled "FIXME".
Change-Id: Ifbdac1d70e4d279ab175eef03e9d792d44873c51
John Reck [Tue, 25 Mar 2014 17:46:18 +0000 (17:46 +0000)]
Merge "Move where updateProperties is called"
John Reck [Tue, 25 Mar 2014 17:25:33 +0000 (17:25 +0000)]
Merge "Add missing null check"
John Reck [Tue, 25 Mar 2014 17:22:09 +0000 (10:22 -0700)]
Add missing null check
Bug:
13635394
mDisplayListData can be null, make sure
to check for that before trying to walk through the
children list in updateProperties
Change-Id: I8d97b1656c1acf47b7c5df8a8771b0f30907261d
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"
Scott Main [Tue, 25 Mar 2014 10:24:02 +0000 (10:24 +0000)]
am
686f041e: am
77dc3c00: am
27fa561f: am
52f449fd: fix size and behavior of video thumbnail when flash not available
* commit '
686f041ea484abe23e5d70fcc141de687f38d1df':
fix size and behavior of video thumbnail when flash not available
Scott Main [Tue, 25 Mar 2014 10:18:28 +0000 (10:18 +0000)]
am
77dc3c00: am
27fa561f: am
52f449fd: fix size and behavior of video thumbnail when flash not available
* commit '
77dc3c00cb102fe91634aa63edf8fbec4a5ad03f':
fix size and behavior of video thumbnail when flash not available
Ricardo Cervera [Tue, 25 Mar 2014 10:14:40 +0000 (10:14 +0000)]
am
addeab5c: am
bd48af2c: am
cd64a9ba: am
399b9994: docs: Added release notes for Google APIs System Image v4.
* commit '
addeab5c0459223be9a1059b18b3f2e34188328a':
docs: Added release notes for Google APIs System Image v4.
Matthew Williams [Tue, 25 Mar 2014 10:14:37 +0000 (10:14 +0000)]
am
4bcf922a: am
c798e4f5: am
4701b51a: am
bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit '
4bcf922a55beb0513f7c9cc18c57e6f3d2cd729e':
DO NOT MERGE: Downgrade expedited to normal on reschedule.
Scott Main [Tue, 25 Mar 2014 10:14:34 +0000 (10:14 +0000)]
am
941eabc2: am
e9b50e75: am
9d8184e7: am
779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions
* commit '
941eabc24819901f46f15cc1929408574240f64b':
update wear homepage with layout fixes and replace GIFs with smaller versions
Scott Main [Tue, 25 Mar 2014 10:11:55 +0000 (10:11 +0000)]
am
27fa561f: am
52f449fd: fix size and behavior of video thumbnail when flash not available
* commit '
27fa561f56bac8867e462fc793fecaf3449c5158':
fix size and behavior of video thumbnail when flash not available
Scott Main [Tue, 25 Mar 2014 10:06:36 +0000 (10:06 +0000)]
am
52f449fd: fix size and behavior of video thumbnail when flash not available
* commit '
52f449fd5a999aea77fa8df3628af7845d0cfcef':
fix size and behavior of video thumbnail when flash not available
Ricardo Cervera [Tue, 25 Mar 2014 10:04:59 +0000 (10:04 +0000)]
am
bd48af2c: am
cd64a9ba: am
399b9994: docs: Added release notes for Google APIs System Image v4.
* commit '
bd48af2cd753025828bb5e76194da0f910b99ba3':
docs: Added release notes for Google APIs System Image v4.
Matthew Williams [Tue, 25 Mar 2014 10:04:56 +0000 (10:04 +0000)]
am
c798e4f5: am
4701b51a: am
bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit '
c798e4f5497c39a3c6c14b120cffdee1122a9212':
DO NOT MERGE: Downgrade expedited to normal on reschedule.
Scott Main [Tue, 25 Mar 2014 10:04:51 +0000 (10:04 +0000)]
am
e9b50e75: am
9d8184e7: am
779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions
* commit '
e9b50e75a050e75161aa316b0c73bdab500ca14d':
update wear homepage with layout fixes and replace GIFs with smaller versions
Ricardo Cervera [Tue, 25 Mar 2014 09:57:43 +0000 (09:57 +0000)]
am
cd64a9ba: am
399b9994: docs: Added release notes for Google APIs System Image v4.
* commit '
cd64a9ba96bed7841e01fa125241d0410fc7b214':
docs: Added release notes for Google APIs System Image v4.
Matthew Williams [Tue, 25 Mar 2014 09:57:36 +0000 (09:57 +0000)]
am
4701b51a: am
bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit '
4701b51af216ce2b6fa9fa508ebba47bf13063c7':
DO NOT MERGE: Downgrade expedited to normal on reschedule.
Scott Main [Tue, 25 Mar 2014 09:57:09 +0000 (09:57 +0000)]
am
9d8184e7: am
779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions
* commit '
9d8184e790b49238fa17cf24bf744596ce1ee195':
update wear homepage with layout fixes and replace GIFs with smaller versions
Yohann Roussel [Tue, 25 Mar 2014 09:38:42 +0000 (09:38 +0000)]
Merge "Add one test application for multidex."
Scott Main [Tue, 25 Mar 2014 06:23:22 +0000 (23:23 -0700)]
fix size and behavior of video thumbnail when flash not available
Change-Id: Ifc5eae0f9e42cc16b0daab9e715ff885388cf91c
Selim Cinek [Tue, 25 Mar 2014 04:00:26 +0000 (04:00 +0000)]
am
f7805dd7: am
7290b56b: am
8ae8689d: am
c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
* commit '
f7805dd77aab98bcf2153bdd5e22f1c44beed137':
Fixed wallpaper bug where wrong size was taken when cropping
Gabriel Peal [Tue, 25 Mar 2014 04:00:23 +0000 (04:00 +0000)]
am
4668f1ed: am
8ee4491d: am
e05077d7: am
83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* commit '
4668f1ed0d9b4fbb321d25803192d53c31d1ec3d':
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
John Reck [Tue, 25 Mar 2014 04:00:18 +0000 (21:00 -0700)]
Move where updateProperties is called
Change-Id: I27da448996019094c44487ce28c5689d098d6535
Selim Cinek [Tue, 25 Mar 2014 03:54:14 +0000 (03:54 +0000)]
am
7290b56b: am
8ae8689d: am
c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
* commit '
7290b56b51119070c549d88d3946d61e34f62ba3':
Fixed wallpaper bug where wrong size was taken when cropping
Gabriel Peal [Tue, 25 Mar 2014 03:54:11 +0000 (03:54 +0000)]
am
8ee4491d: am
e05077d7: am
83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* commit '
8ee4491dc80943429cd79d0c7b87c28056067a58':
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
Selim Cinek [Tue, 25 Mar 2014 03:46:27 +0000 (03:46 +0000)]
am
8ae8689d: am
c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
* commit '
8ae8689d165299bd0bbd0e04bff987dad352c8f5':
Fixed wallpaper bug where wrong size was taken when cropping
Gabriel Peal [Tue, 25 Mar 2014 03:46:17 +0000 (03:46 +0000)]
am
e05077d7: am
83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* commit '
e05077d78c9abde054a754db53e71c647b9a705c':
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
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
Ricardo Cervera [Tue, 25 Mar 2014 00:16:55 +0000 (00:16 +0000)]
am
399b9994: docs: Added release notes for Google APIs System Image v4.
* commit '
399b99940e68eec11de1d0a23df67740ac3fdbd4':
docs: Added release notes for Google APIs System Image v4.
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
Ricardo Cervera [Tue, 25 Mar 2014 00:01:35 +0000 (17:01 -0700)]
docs: Added release notes for Google APIs System Image v4.
Change-Id: Iac43dc318de44d19d48b0977c951cbc600b5c396
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
Matthew Williams [Mon, 24 Mar 2014 22:39:21 +0000 (22:39 +0000)]
am
bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit '
bb87ac7f9733ca9b490cb34e8a675dba083a57b7':
DO NOT MERGE: Downgrade expedited to normal on reschedule.
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
Scott Main [Mon, 24 Mar 2014 22:14:29 +0000 (22:14 +0000)]
am
779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions
* commit '
779174ea182908e18d821656fc408697485a1f7a':
update wear homepage with layout fixes and replace GIFs with smaller versions
Dianne Hackborn [Mon, 24 Mar 2014 21:53:39 +0000 (14:53 -0700)]
Fix build.
Change-Id: I1dd79e932a551bd537d2c71e8fca29a299c9312f
Matthew Williams [Mon, 24 Mar 2014 21:42:06 +0000 (14:42 -0700)]
DO NOT MERGE: Downgrade expedited to normal on reschedule.
bug:
12033540
Expedited was previously tracked by a redundant internal variable, ostensibly
as an optimisation. This variable could differ from the value in the bundle
depending on how the operation is initialised, which led to confusion. Now an
expedited sync will only be treated as such on its first execution.
Change-Id: Ibfc4e9e49b86c82f2364a6ef55f887705a053eb6
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)
Scott Main [Mon, 24 Mar 2014 20:53:24 +0000 (13:53 -0700)]
update wear homepage with layout fixes and replace GIFs with smaller versions
Change-Id: I2e0b4efed83a4de7e095ece18d3c73634a23f964
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"