OSDN Git Service
Scott Main [Mon, 14 Oct 2013 20:17:46 +0000 (13:17 -0700)]
am
d19a1ff4: am
3f4fcef5: am
25c89dda: enable auto-linking to next lesson with \'next-page-link\' css class
* commit '
d19a1ff4b2c4a3c7d76ea94702776e8b2087d705':
enable auto-linking to next lesson with 'next-page-link' css class
Scott Main [Mon, 14 Oct 2013 20:14:22 +0000 (13:14 -0700)]
am
3f4fcef5: am
25c89dda: enable auto-linking to next lesson with \'next-page-link\' css class
* commit '
3f4fcef5830095ecd7360ee82c59ab6c41b5c826':
enable auto-linking to next lesson with 'next-page-link' css class
Scott Main [Mon, 14 Oct 2013 20:11:12 +0000 (13:11 -0700)]
am
25c89dda: enable auto-linking to next lesson with \'next-page-link\' css class
* commit '
25c89dda9f416466f28f2fb2341d272ace709199':
enable auto-linking to next lesson with 'next-page-link' css class
Scott Main [Mon, 7 Oct 2013 21:17:55 +0000 (14:17 -0700)]
enable auto-linking to next lesson with 'next-page-link' css class
Change-Id: I9f4068a4b0921eee28eee3258b72e5f3ad48a64d
Ed Heyl [Tue, 8 Oct 2013 22:56:09 +0000 (15:56 -0700)]
merge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 22:35:32 +0000 (15:35 -0700)]
merge in KQS81M
Jamie Gennis [Tue, 8 Oct 2013 22:08:54 +0000 (22:08 +0000)]
Merge "BoardConfig: Add and document vsync phase offset setting" into klp-dev
Jamie Gennis [Sun, 6 Oct 2013 23:02:02 +0000 (16:02 -0700)]
BoardConfig: Add and document vsync phase offset setting
Bug:
10624956
Change-Id: I82def5730f9d09396809d4b8cd2ea44829b21f22
The Android Automerger [Mon, 7 Oct 2013 17:47:43 +0000 (10:47 -0700)]
KQS81M
The Android Automerger [Fri, 4 Oct 2013 19:51:23 +0000 (12:51 -0700)]
"KQS81L"
Dianne Hackborn [Thu, 3 Oct 2013 18:41:08 +0000 (11:41 -0700)]
So long Key Lime Pie, it was nice knowing you.
Now we are KitKat.
I mean Android 4.4 API 19.
Or whatever.
Bug:
10348975
Change-Id: Ic0fa9c82277bb6d6fb79e6095b5ec0e9eb35a04a
The Android Automerger [Thu, 3 Oct 2013 01:42:40 +0000 (18:42 -0700)]
"KQS81K"
Colin Cross [Thu, 3 Oct 2013 00:47:50 +0000 (00:47 +0000)]
Merge "don't check paths of non-installed or host modules" into klp-dev
The Android Automerger [Wed, 2 Oct 2013 23:35:12 +0000 (16:35 -0700)]
"KQS81J"
Justin Koh [Wed, 2 Oct 2013 23:13:17 +0000 (23:13 +0000)]
Merge "Move DownloadProviderUi from core_minimal to core.mk" into klp-dev
Colin Cross [Wed, 2 Oct 2013 22:16:35 +0000 (15:16 -0700)]
don't check paths of non-installed or host modules
Static libraries and host modules are not installed under
TARGET_OUT_VENDOR and don't need to be, relax the checks.
Change-Id: Ia8b926d466420a8b6dd418d5e95fdf5ff919e078
Justin Koh [Wed, 2 Oct 2013 21:32:15 +0000 (14:32 -0700)]
Move DownloadProviderUi from core_minimal to core.mk
Move DownloadProviderUi from core_minimal to core.mk. This UI requires
DocumentsUi so it doesn't make sense to ship it on devices which are only
using core_minimal.
Change-Id: Id8a4f2a9835a05e9281596dbd5ca7b8e76062cd4
Chris Wren [Wed, 2 Oct 2013 17:30:27 +0000 (13:30 -0400)]
support protos in host java libraries
Change-Id: Ia4499d439ea23ee4d6707cfb005b7230c0a2374f
Ying Wang [Wed, 2 Oct 2013 18:14:56 +0000 (11:14 -0700)]
am
164a9639: am
9e8b6c42: am
3d48d9c3: Allow to run checkbuild in sdk build.
* commit '
164a963962b7b2816bb92016c6ce0ff52ac93c43':
Allow to run checkbuild in sdk build.
Ying Wang [Wed, 2 Oct 2013 18:13:13 +0000 (11:13 -0700)]
am
9e8b6c42: am
3d48d9c3: Allow to run checkbuild in sdk build.
* commit '
9e8b6c429d9d17d8251ae8aa15c6de2420732431':
Allow to run checkbuild in sdk build.
Ying Wang [Wed, 2 Oct 2013 18:11:13 +0000 (11:11 -0700)]
am
3d48d9c3: Allow to run checkbuild in sdk build.
* commit '
3d48d9c36b2d2cd696d3ee2656939e77ca5ba950':
Allow to run checkbuild in sdk build.
Ying Wang [Thu, 27 Jun 2013 00:56:08 +0000 (17:56 -0700)]
Allow to run checkbuild in sdk build.
Bug:
9594464
Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
(cherry picked from commit
fcec57a1165dc78ca2630c017dd95bddce31e55a)
Ying Wang [Wed, 2 Oct 2013 01:16:45 +0000 (18:16 -0700)]
Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includes
only if the module is built against the platform, not the SDK.
Previously it added it if it's doing a platform build.
But we can do an apps_only build inside the platform source tree and
such a build may build modules against the platform.
This fixes the apps build in the platform source tree.
Change-Id: I73e32a8f0e505349790a102321f88e77fba472cd
The Android Automerger [Tue, 1 Oct 2013 04:00:24 +0000 (21:00 -0700)]
"KQS81I"
Ben Gilad [Mon, 30 Sep 2013 23:54:17 +0000 (16:54 -0700)]
Replace a dangling refeence to packages/apps/Phone.
Change-Id: I47b68510d19ccbaa2fc125c2a422fd1e857ec18e
The Android Automerger [Sun, 29 Sep 2013 21:43:12 +0000 (14:43 -0700)]
"KFS78N"
The Android Automerger [Sun, 29 Sep 2013 20:33:42 +0000 (13:33 -0700)]
"KQS81H"
The Android Automerger [Sun, 29 Sep 2013 02:40:24 +0000 (19:40 -0700)]
KFS78M
The Android Automerger [Thu, 26 Sep 2013 05:14:47 +0000 (22:14 -0700)]
KQS81G
The Android Automerger [Thu, 26 Sep 2013 04:34:22 +0000 (21:34 -0700)]
KQS81F
Justin Ho [Thu, 19 Sep 2013 21:46:55 +0000 (14:46 -0700)]
Remove Email from HH FactoryROM
Bug:
10806060
Change-Id: I037f2886fbcdc6f444140b4ded3594a41ecefd1e
The Android Automerger [Wed, 25 Sep 2013 20:08:12 +0000 (13:08 -0700)]
KQS81E
Ying Wang [Wed, 25 Sep 2013 19:37:19 +0000 (12:37 -0700)]
am
b6da30c3: am
2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM
* commit '
b6da30c3724cc2a452be2c1ae425eff4f7d55944':
Allow module to specify LOCAL_INSTALLED_MODULE_STEM
Baligh Uddin [Wed, 25 Sep 2013 19:37:18 +0000 (12:37 -0700)]
am
55dc7844: am
d21a641f: (-s ours) am
fe66c390: bump version to 4.3.1
* commit '
55dc78446e4a3f8048d28bb78a7b9f2b988494bf':
bump version to 4.3.1
Ying Wang [Wed, 25 Sep 2013 19:35:04 +0000 (12:35 -0700)]
am
2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM
* commit '
2408479cf9cf9cfe87e464e9b5d2f36143818d37':
Allow module to specify LOCAL_INSTALLED_MODULE_STEM
Baligh Uddin [Wed, 25 Sep 2013 19:35:04 +0000 (12:35 -0700)]
am
d21a641f: (-s ours) am
fe66c390: bump version to 4.3.1
* commit '
d21a641fb4c27fdba21b72116a4e5e722a7acf6f':
bump version to 4.3.1
Ying Wang [Tue, 24 Sep 2013 22:56:11 +0000 (15:56 -0700)]
Allow module to specify LOCAL_INSTALLED_MODULE_STEM
With this change, you can install a shared library with module name foo
as bar.so to the system.img with:
LOCAL_INSTALLED_MODULE_STEM := bar.so
Note that we in general still disallow a static/shared library to
specify LOCAL_MODULE_STEM or LOCAL_BUILT_MODULE_STEM, because the build
system uses LOCAL_MODULE to compute build time dependencies, such as
export_includes, the -l linker flag etc.
Also, if you use LOCAL_INSTALLED_MODULE_STEM to change the installed
file name and if any other module links against this library, you may
run into runtime error: the library name baked in to the binary is not
the same as file name in the system image.
Change-Id: I55b571c8139c3bda07a4a0e50cea0f20d8d6c168
Eino-Ville Talvala [Wed, 25 Sep 2013 01:09:20 +0000 (01:09 +0000)]
Merge "Add android-ex-camera2 static java library to PDK." into klp-dev
Eino-Ville Talvala [Tue, 24 Sep 2013 23:57:28 +0000 (16:57 -0700)]
Add android-ex-camera2 static java library to PDK.
Library is located frameworks/ex/camera2/public.
This is required to allow pdk/apps/CameraITS to build in the PDK.
Bug:
10337323
Change-Id: I5b835134012f90462a70b9e38b69c3168df00cfd
Dan Willemsen [Tue, 24 Sep 2013 04:15:23 +0000 (21:15 -0700)]
Don't check vendor path for phony packages
These don't get installed, so they don't need to be in TARGET_OUT_VENDOR
Change-Id: I887ca4758e7c477808ed9a6b621dfd3f4ede5f32
Baligh Uddin [Mon, 23 Sep 2013 22:54:41 +0000 (15:54 -0700)]
am
fe66c390: bump version to 4.3.1
* commit '
fe66c390fb4068b380068a99311fdc42ae56dfa6':
bump version to 4.3.1
The Android Automerger [Mon, 23 Sep 2013 22:43:15 +0000 (15:43 -0700)]
"KQS81D"
Baligh Uddin [Mon, 23 Sep 2013 22:05:45 +0000 (15:05 -0700)]
bump version to 4.3.1
The Android Automerger [Sun, 22 Sep 2013 19:35:45 +0000 (12:35 -0700)]
"KQS81C"
The Android Automerger [Sat, 21 Sep 2013 17:10:09 +0000 (10:10 -0700)]
KQS81B
The Android Automerger [Sat, 21 Sep 2013 17:09:17 +0000 (10:09 -0700)]
"KQS83"
The Android Automerger [Sat, 21 Sep 2013 15:53:39 +0000 (08:53 -0700)]
KFS78L
The Android Automerger [Sat, 21 Sep 2013 01:25:46 +0000 (18:25 -0700)]
KFS78K
The Android Automerger [Fri, 20 Sep 2013 22:45:38 +0000 (15:45 -0700)]
KRS81G
The Android Automerger [Fri, 20 Sep 2013 21:53:25 +0000 (14:53 -0700)]
"KFS78J"
The Android Automerger [Fri, 20 Sep 2013 21:39:40 +0000 (14:39 -0700)]
"KRS81F"
The Android Automerger [Fri, 20 Sep 2013 19:39:51 +0000 (12:39 -0700)]
"KRS81E"
Scott Main [Fri, 20 Sep 2013 17:07:04 +0000 (10:07 -0700)]
am
14e066d5: am
4ec62cee: am
40de3237: add support for custom <head> tags in each file with page.customHeadTag HDF var
* commit '
14e066d5c8aedfad8b29b6784793f416af01e392':
add support for custom <head> tags in each file with page.customHeadTag HDF var
Scott Main [Fri, 20 Sep 2013 17:04:27 +0000 (10:04 -0700)]
am
4ec62cee: am
40de3237: add support for custom <head> tags in each file with page.customHeadTag HDF var
* commit '
4ec62ceeac20522101ddd9baaddb3ee26db8a9f2':
add support for custom <head> tags in each file with page.customHeadTag HDF var
Scott Main [Fri, 20 Sep 2013 17:01:06 +0000 (10:01 -0700)]
am
40de3237: add support for custom <head> tags in each file with page.customHeadTag HDF var
* commit '
40de323797294ae4c6f41c958df9ef81cfa33ecb':
add support for custom <head> tags in each file with page.customHeadTag HDF var
Scott Main [Fri, 20 Sep 2013 15:50:17 +0000 (08:50 -0700)]
add support for custom <head> tags in each file with page.customHeadTag HDF var
Change-Id: I377910acec78c600d20cf10ca6aa706750107093
The Android Automerger [Fri, 20 Sep 2013 10:34:38 +0000 (03:34 -0700)]
"KRS81D"
The Android Automerger [Thu, 19 Sep 2013 23:49:35 +0000 (16:49 -0700)]
"KRS81C"
The Android Automerger [Thu, 19 Sep 2013 23:31:23 +0000 (16:31 -0700)]
KFS78I
Brian Carlstrom [Thu, 12 Sep 2013 07:22:42 +0000 (00:22 -0700)]
Enable art for user builds
Bug:
10069754
Change-Id: Iaaff33a97bd7b68b2e8d84cd0034b15dde8a4316
Justin Ho [Thu, 19 Sep 2013 21:46:55 +0000 (14:46 -0700)]
Remove Email from HH FactoryROM
Bug:
10806060
Change-Id: I037f2886fbcdc6f444140b4ded3594a41ecefd1e
The Android Automerger [Thu, 19 Sep 2013 21:16:07 +0000 (14:16 -0700)]
"KRS81B"
The Android Automerger [Thu, 19 Sep 2013 19:14:26 +0000 (12:14 -0700)]
"KFS78H"
The Android Automerger [Thu, 19 Sep 2013 19:14:12 +0000 (12:14 -0700)]
merge in klp-factoryrom-release history after reset to klp-dev
The Android Automerger [Thu, 19 Sep 2013 13:03:36 +0000 (06:03 -0700)]
"KRS81"
The Android Automerger [Thu, 19 Sep 2013 13:00:48 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 19 Sep 2013 04:20:23 +0000 (21:20 -0700)]
"KFS78G"
The Android Automerger [Wed, 18 Sep 2013 23:57:46 +0000 (16:57 -0700)]
KFS78F
The Android Automerger [Wed, 18 Sep 2013 20:33:59 +0000 (13:33 -0700)]
"KRS80B"
The Android Automerger [Wed, 18 Sep 2013 13:01:39 +0000 (06:01 -0700)]
"KRS80"
The Android Automerger [Wed, 18 Sep 2013 13:00:29 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Brian Carlstrom [Wed, 18 Sep 2013 06:41:37 +0000 (06:41 +0000)]
Merge "Add oatdump for ART to go with dexdump for Dalvik" into klp-dev
The Android Automerger [Wed, 18 Sep 2013 04:19:37 +0000 (21:19 -0700)]
KFS78E
The Android Automerger [Wed, 18 Sep 2013 04:13:11 +0000 (21:13 -0700)]
"KRS79C"
The Android Automerger [Wed, 18 Sep 2013 04:10:49 +0000 (21:10 -0700)]
merge in klp-release history after reset to klp-dev
Jean-Michel Trivi [Wed, 18 Sep 2013 01:48:35 +0000 (01:48 +0000)]
Merge "Add loudness enhancer to platform" into klp-dev
Brian Carlstrom [Wed, 18 Sep 2013 01:25:12 +0000 (18:25 -0700)]
Add oatdump for ART to go with dexdump for Dalvik
Bug:
10807447
Change-Id: I48d1bc0ca025215383161dbf160d4f9270d97496
The Android Automerger [Wed, 18 Sep 2013 00:40:19 +0000 (17:40 -0700)]
"KRS78C"
The Android Automerger [Wed, 18 Sep 2013 00:39:41 +0000 (17:39 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 17 Sep 2013 22:53:47 +0000 (15:53 -0700)]
"KRS79B"
The Android Automerger [Tue, 17 Sep 2013 22:20:47 +0000 (15:20 -0700)]
KFS78D
The Android Automerger [Tue, 17 Sep 2013 13:02:38 +0000 (06:02 -0700)]
"KRS79"
The Android Automerger [Tue, 17 Sep 2013 13:00:17 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 17 Sep 2013 03:14:02 +0000 (20:14 -0700)]
KFS78C
The Android Automerger [Mon, 16 Sep 2013 22:38:09 +0000 (15:38 -0700)]
KRS78B
Michael Jurka [Mon, 16 Sep 2013 19:13:56 +0000 (19:13 +0000)]
Merge "Add default WallpaperCropper to the build" into klp-dev
The Android Automerger [Mon, 16 Sep 2013 18:08:03 +0000 (11:08 -0700)]
"KFS78B"
The Android Automerger [Mon, 16 Sep 2013 18:06:05 +0000 (11:06 -0700)]
merge in klp-factoryrom-release history after reset to klp-release
Scott Main [Mon, 16 Sep 2013 18:05:17 +0000 (11:05 -0700)]
am
8b4e768f: am
013bf8c8: am
e48657b2: Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
* commit '
8b4e768ffd159772ed064a948433028f1e39a386':
Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
Scott Main [Mon, 16 Sep 2013 18:03:15 +0000 (11:03 -0700)]
am
013bf8c8: am
e48657b2: Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
* commit '
013bf8c8c46b844eb58e376b3a45ecfa4f5f4763':
Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
Scott Main [Mon, 16 Sep 2013 18:01:54 +0000 (11:01 -0700)]
am
e48657b2: Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
* commit '
e48657b2aeac15b522e5ba60e4719844e2d8183f':
Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
Scott Main [Thu, 12 Sep 2013 18:45:05 +0000 (18:45 +0000)]
Revert "remove renderscript support lib from javadocs"
... put support lib javadocs for renderscript back in.
This reverts commit
5b743677eb4bb91af98b005651370885bdaae3e5.
Change-Id: Ia093b04e79ed35d18d9ced7b827a0b06ec4439c1
(cherry picked from commit
27597c4d8ee7623152bf908b05eed6b869987c14)
Jeff Sharkey [Mon, 16 Sep 2013 17:37:36 +0000 (10:37 -0700)]
Remove Terminal for now.
Bug:
10780928
Change-Id: Iab3991e8d7df7d29e108e389ea18702c5e7efa25
Jean-Michel Trivi [Tue, 10 Sep 2013 16:41:06 +0000 (09:41 -0700)]
Add loudness enhancer to platform
Add loudness enhancement audio effect to the platform.
Bug
8413913
Change-Id: I00cf4ca6f68572594731102d33ae525b57d43d96
The Android Automerger [Mon, 16 Sep 2013 13:04:54 +0000 (06:04 -0700)]
"KRS78"
The Android Automerger [Mon, 16 Sep 2013 13:00:34 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Michael Jurka [Mon, 16 Sep 2013 11:07:50 +0000 (13:07 +0200)]
Add default WallpaperCropper to the build
The Android Automerger [Mon, 16 Sep 2013 02:47:46 +0000 (19:47 -0700)]
"KRS74J"
The Android Automerger [Sat, 14 Sep 2013 21:01:07 +0000 (14:01 -0700)]
"KRS74I"
The Android Automerger [Sat, 14 Sep 2013 04:58:44 +0000 (21:58 -0700)]
"KRS74H"