OSDN Git Service
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
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)
Scott Main [Sat, 14 Sep 2013 00:58:32 +0000 (17:58 -0700)]
am
fe340fac: am
e624b3fa: update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
* commit '
fe340fac5aa08c9bbba6ce22521a10fce1b811f8':
update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
Scott Main [Sat, 14 Sep 2013 00:55:54 +0000 (17:55 -0700)]
am
e624b3fa: update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
* commit '
e624b3fa474283e0c8d869b9d1754f001e83e349':
update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
Scott Main [Thu, 12 Sep 2013 19:56:41 +0000 (12:56 -0700)]
update the init_google_navtree2 method to handle new format for sample nav tree data.
and update highlighting logic to handle hashtags
Change-Id: I77de8faaaeed12317aa83086df8273648a1ff00a
Scott Main [Thu, 12 Sep 2013 19:16:02 +0000 (12:16 -0700)]
am
9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
* commit '
9a3fb8711f93751ba3e709f4e99691147e6c2c93':
Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
Scott Main [Thu, 12 Sep 2013 19:14:19 +0000 (19:14 +0000)]
Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
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
Scott Main [Wed, 11 Sep 2013 17:15:04 +0000 (10:15 -0700)]
am
d6125b5e: am
2552239a: fix most of size problems of DAC on handsets. set device-width for viewport tag
* commit '
d6125b5e2ff71988009bc0fd86a32876e9a6981f':
fix most of size problems of DAC on handsets. set device-width for viewport tag
Scott Main [Wed, 11 Sep 2013 17:09:47 +0000 (10:09 -0700)]
am
2552239a: fix most of size problems of DAC on handsets. set device-width for viewport tag
* commit '
2552239a522963429f494ff89a4be6d3831fb1fb':
fix most of size problems of DAC on handsets. set device-width for viewport tag
Scott Main [Tue, 10 Sep 2013 01:51:49 +0000 (18:51 -0700)]
fix most of size problems of DAC on handsets.
set device-width for viewport tag
Change-Id: I87854bfac990d277ba95cc7bcf37799c7f36a0ee
Dirk Dougherty [Fri, 6 Sep 2013 18:48:17 +0000 (11:48 -0700)]
am
471f0cc8: am
243ffc5b: Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
* commit '
471f0cc84adbb666e4d0e2529feb326df6d3baa3':
Build file breadcrumb from parentdirs keys, optionally linkify.
Dirk Dougherty [Fri, 6 Sep 2013 18:44:42 +0000 (11:44 -0700)]
am
243ffc5b: Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
* commit '
243ffc5bc2f26041b440ad107c1725913c73765a':
Build file breadcrumb from parentdirs keys, optionally linkify.
Dirk Dougherty [Fri, 6 Sep 2013 18:41:44 +0000 (18:41 +0000)]
Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
Dirk Dougherty [Thu, 5 Sep 2013 00:54:49 +0000 (17:54 -0700)]
Build file breadcrumb from parentdirs keys, optionally linkify.
Change-Id: I7f4c9887d77c6d3ab1aca4e05963b6144a8b22f8
Scott Main [Fri, 6 Sep 2013 00:04:33 +0000 (17:04 -0700)]
am
5d9690e3: am
4a9cc386: remove prev/next links from API guides
* commit '
5d9690e376b27ede23c5f8b45e8689ffe30ef290':
remove prev/next links from API guides
Scott Main [Fri, 6 Sep 2013 00:01:13 +0000 (17:01 -0700)]
am
4a9cc386: remove prev/next links from API guides
* commit '
4a9cc3864a4fcb80522805bbef5052ff914311e3':
remove prev/next links from API guides
Scott Main [Thu, 5 Sep 2013 23:29:00 +0000 (16:29 -0700)]
remove prev/next links from API guides
Change-Id: Ic80ec436a6ee1c7decc3a6fc8905f52a1b50ea6a
Scott Main [Thu, 5 Sep 2013 04:19:39 +0000 (21:19 -0700)]
am
eb23299b: am
0ad622b4: add ellipsis for overflowing strings in samples nav
* commit '
eb23299bd55853135ebf3f8a99a0d0bcf1364b0a':
add ellipsis for overflowing strings in samples nav
Scott Main [Thu, 5 Sep 2013 04:17:35 +0000 (21:17 -0700)]
am
0ad622b4: add ellipsis for overflowing strings in samples nav
* commit '
0ad622b4a6fcaa4232b543aba3e28ec982b50d08':
add ellipsis for overflowing strings in samples nav
Scott Main [Thu, 5 Sep 2013 04:14:06 +0000 (21:14 -0700)]
add ellipsis for overflowing strings in samples nav
Change-Id: I1efcba409b068be0616eb2e3d80fadda301fd5f6
Dirk Dougherty [Tue, 3 Sep 2013 22:22:45 +0000 (15:22 -0700)]
am
d55fb681: am
6fb7e23b: Add file path above h1 in samplecode files.
* commit '
d55fb681d6766369e2dec734e22534fd43d9cc70':
Add file path above h1 in samplecode files.
Dirk Dougherty [Tue, 3 Sep 2013 22:20:43 +0000 (15:20 -0700)]
am
6fb7e23b: Add file path above h1 in samplecode files.
* commit '
6fb7e23bbaf07c5b89e885656d15efea07c527dc':
Add file path above h1 in samplecode files.
Dirk Dougherty [Sat, 31 Aug 2013 02:06:57 +0000 (19:06 -0700)]
Add file path above h1 in samplecode files.
Change-Id: I91adb197b478ea476bbf0e07650486581c1ca8ec
Ying Wang [Thu, 29 Aug 2013 05:14:21 +0000 (22:14 -0700)]
am
019891c1: am
fc9cd4f5: Create an empty zip file if no dict file found.
* commit '
019891c1b858e571edd748e884b18d22d8efd10a':
Create an empty zip file if no dict file found.
Ying Wang [Thu, 29 Aug 2013 05:11:44 +0000 (22:11 -0700)]
am
fc9cd4f5: Create an empty zip file if no dict file found.
* commit '
fc9cd4f5c17eb51f09bb3fe14526894c7fa33ba6':
Create an empty zip file if no dict file found.
Ying Wang [Thu, 29 Aug 2013 01:38:25 +0000 (18:38 -0700)]
Create an empty zip file if no dict file found.
Instead of touch an empty file.
Change-Id: Ifa8bb04cea6fc0fc3165337f6815d5976bac677d
(cherry picked from commit
c62c92c3d737304cbd38e99e92f29e193b15b7c8)
Dirk Dougherty [Mon, 26 Aug 2013 18:54:33 +0000 (11:54 -0700)]
am
2747bec3: am
981effcc: Add breadcrumb for sample code html pages.
* commit '
2747bec31735e212a345865b4cb42dfc2bae7800':
Add breadcrumb for sample code html pages.
Dirk Dougherty [Mon, 26 Aug 2013 18:52:05 +0000 (11:52 -0700)]
am
981effcc: Add breadcrumb for sample code html pages.
* commit '
981effcc96fd7ea0b6b03546701e56dff52500d0':
Add breadcrumb for sample code html pages.
Dirk Dougherty [Fri, 23 Aug 2013 04:26:54 +0000 (21:26 -0700)]
Add breadcrumb for sample code html pages.
Change-Id: Iaec2e2686ce2fba4169f0d2ee80c122c6ae55bee
Ying Wang [Fri, 23 Aug 2013 19:18:11 +0000 (12:18 -0700)]
am
ddce2eb0: am
de32713f: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '
ddce2eb007c97b8ca94bc7b3190a83006df0c187':
Collect and store proguard obfuscation dictionary files.
Ying Wang [Fri, 23 Aug 2013 19:16:16 +0000 (12:16 -0700)]
am
de32713f: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '
de32713f47b33c6d4c0bb4c8943e1eccf81aa0c5':
Collect and store proguard obfuscation dictionary files.
Ying Wang [Fri, 23 Aug 2013 19:14:20 +0000 (19:14 +0000)]
Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
Ying Wang [Fri, 23 Aug 2013 03:52:47 +0000 (20:52 -0700)]
Collect and store proguard obfuscation dictionary files.
Collect and store proguard obfuscation dictionary files.
Only do this for apps_only build for now.
Bug:
9407666
Change-Id: I51c78bf0f42f959dc920de230e60e0f71ed0d0ea
Ying Wang [Fri, 23 Aug 2013 19:07:45 +0000 (12:07 -0700)]
am
653a037d: am
638ce57a: Treat LOCAL_APK_LIBRARIES like shared Java libraries.
* commit '
653a037d70d770d2fc03d4f205a9c626af5f5c76':
Treat LOCAL_APK_LIBRARIES like shared Java libraries.
Ying Wang [Fri, 23 Aug 2013 19:03:47 +0000 (12:03 -0700)]
am
638ce57a: Treat LOCAL_APK_LIBRARIES like shared Java libraries.
* commit '
638ce57a5848c10d781502bf198a2b93aeb58a7a':
Treat LOCAL_APK_LIBRARIES like shared Java libraries.
Ying Wang [Fri, 23 Aug 2013 18:59:49 +0000 (11:59 -0700)]
Treat LOCAL_APK_LIBRARIES like shared Java libraries.
This fix proguard build.
Bug:
10307372
Change-Id: Id99d6e903077b4bacdea2e68cbb78e46a4a6afb8
Ying Wang [Fri, 23 Aug 2013 17:14:48 +0000 (10:14 -0700)]
am
06de9f94: am
8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit '
06de9f940c34b8ade1f1866fbc1c6b32f93277b4':
Revert "Collect and store proguard obfuscation dictionary files."
Ying Wang [Fri, 23 Aug 2013 17:13:19 +0000 (10:13 -0700)]
am
8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit '
8709497ed82800f399e99516df59afdb1bae8472':
Revert "Collect and store proguard obfuscation dictionary files."
Ying Wang [Fri, 23 Aug 2013 17:11:29 +0000 (17:11 +0000)]
Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
Ying Wang [Fri, 23 Aug 2013 17:11:18 +0000 (17:11 +0000)]
Revert "Collect and store proguard obfuscation dictionary files."
This reverts commit
41dbe1e535c1aea9a4c4cec6be637fe1b882220b.
Change-Id: I023594779128083b75a069fd860cd29dd7951ef5
Ying Wang [Fri, 23 Aug 2013 17:09:28 +0000 (10:09 -0700)]
am
aa87a11d: am
afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '
aa87a11dffec0ea58c93ab0dd23b067975a4c681':
Collect and store proguard obfuscation dictionary files.
Ying Wang [Fri, 23 Aug 2013 17:09:27 +0000 (10:09 -0700)]
am
04c4d34d: am
7311a344: Make it easier to enable obfuscation and optimization.
* commit '
04c4d34d4fdb56c824abf39239d2c87806706b7e':
Make it easier to enable obfuscation and optimization.
Ying Wang [Fri, 23 Aug 2013 17:06:59 +0000 (10:06 -0700)]
am
afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '
afd7457adf844692b5de8f8d7eefedcc10dc7da1':
Collect and store proguard obfuscation dictionary files.
Ying Wang [Fri, 23 Aug 2013 17:06:58 +0000 (10:06 -0700)]
am
7311a344: Make it easier to enable obfuscation and optimization.
* commit '
7311a344bed507062e781ba70331d85652c217d8':
Make it easier to enable obfuscation and optimization.
Ying Wang [Fri, 23 Aug 2013 17:05:31 +0000 (17:05 +0000)]
Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
Ying Wang [Fri, 23 Aug 2013 03:52:47 +0000 (20:52 -0700)]
Collect and store proguard obfuscation dictionary files.
Collect and store proguard obfuscation dictionary files.
Only do this for apps_only build for now.
Bug:
9407666
Change-Id: I0324eed6bb236abb0d3725f8d2a0b6c5c31935fe
Ying Wang [Thu, 22 Aug 2013 01:32:49 +0000 (18:32 -0700)]
Make it easier to enable obfuscation and optimization.
With this change, use:
* LOCAL_PROGUARD_ENABLED := obfuscation # to enable obfuscation
* LOCAL_PROGUARD_ENABLED := optimization # to enable optimization
* LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both
Now the meaning of the LOCAL_PROGUARD_ENABLED options:
* full:
Use the build system's default configurations:
with shrink but no obfuscation or optimization,
global proguard flags in build/core/proguard.flags
are applied.
* custom:
The same as "full" except no aapt-generated resource-related
proguard flags.
* nosystem:
Don't use any build system's default configurations; but
aapt-generated proguard flags are still applied. You are
responsible for any other flags.
* disabled:
Disable proguard.
* obfuscation:
The same as "full" but with obfuscation enabled.
* optimization:
The same as "full" but with optimization enabled.
* no value (the default):
The build system chooses the proper value: "full" if it's an
app; "disabled" if it's a library.
You can use more than 1 of them in a meaningful combination,
for example:
LOCAL_PROGUARD_ENABLED := obfuscation optimization
Bug:
10307372
Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
Scott Main [Thu, 22 Aug 2013 23:37:41 +0000 (16:37 -0700)]
am
fc8140d3: am
d4645ea9: remove project structure from sample landing pages
* commit '
fc8140d32afaef4e7af2a76480452aa3ca0009cc':
remove project structure from sample landing pages
Scott Main [Thu, 22 Aug 2013 23:36:20 +0000 (16:36 -0700)]
am
d4645ea9: remove project structure from sample landing pages
* commit '
d4645ea9d483525175d3d65e7ca90d018f9aa8e9':
remove project structure from sample landing pages
Scott Main [Thu, 22 Aug 2013 23:25:15 +0000 (16:25 -0700)]
remove project structure from sample landing pages
Change-Id: I646aa996ce518421567c09bbb3a0cd8b4875d530
Scott Main [Thu, 22 Aug 2013 23:28:13 +0000 (16:28 -0700)]
am
1ef0d363: am
285f0772: Merge "clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav" into jb-mr2-docs
* commit '
1ef0d36382388e51d011d2dd481d11750a4a858a':
clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav
Scott Main [Thu, 22 Aug 2013 23:28:13 +0000 (16:28 -0700)]
am
2b9846d9: am
f0093857: fix a couple bugs in sidenav for samples. Previously, clicking a link still invoked the expand collapse behavior. Previously, collapsing a parent item did not also collapse its children.
* commit '
2b9846d9d1c075068d192f75f73f44896c95b7db':
fix a couple bugs in sidenav for samples. Previously, clicking a link still invoked the expand collapse behavior. Previously, collapsing a parent item did not also collapse its children.
Scott Main [Thu, 22 Aug 2013 23:23:48 +0000 (16:23 -0700)]
am
285f0772: Merge "clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav" into jb-mr2-docs
* commit '
285f07722d86f422166811ffc810535a97c1eb1e':
clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav
Scott Main [Thu, 22 Aug 2013 23:23:47 +0000 (16:23 -0700)]
am
f0093857: fix a couple bugs in sidenav for samples. Previously, clicking a link still invoked the expand collapse behavior. Previously, collapsing a parent item did not also collapse its children.
* commit '
f009385738c8201e8a964a567acb59ee14fc2116':
fix a couple bugs in sidenav for samples. Previously, clicking a link still invoked the expand collapse behavior. Previously, collapsing a parent item did not also collapse its children.
Scott Main [Thu, 22 Aug 2013 23:22:09 +0000 (23:22 +0000)]
Merge "clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav" into jb-mr2-docs
Scott Main [Thu, 22 Aug 2013 23:03:21 +0000 (16:03 -0700)]
clean up the sample template files to remove unused stuff
and fix the collapsible project list
and highlight the Samples nav
Change-Id: I8baf5874ae709c914aae47ffb04fc8e0b84e8dea
Scott Main [Thu, 22 Aug 2013 18:37:11 +0000 (11:37 -0700)]
fix a couple bugs in sidenav for samples.
Previously, clicking a link still invoked the expand collapse behavior.
Previously, collapsing a parent item did not also collapse its children.
Change-Id: Iac0b9208bfbab79e9715850f9a192c22250d0673
Scott Main [Wed, 21 Aug 2013 23:31:52 +0000 (16:31 -0700)]
am
a320b99a: am
498d710a: modify sample template and add new css/script for new numbered code. The line numbers are included inside the <pre> block initially, but hidden, so this script moves the numbers to a separate block on the left and makes them non-selectable. A
* commit '
a320b99a2db0f038c122a3ab712adf231b99f380':
modify sample template and add new css/script for new numbered code. The line numbers are included inside the <pre> block initially, but hidden, so this script moves the numbers to a separate block on the left and makes them non-selectable. Also includes script for features like single-click to highlight a line of code and double-click to invoke the link for that line.
Scott Main [Wed, 21 Aug 2013 23:28:57 +0000 (16:28 -0700)]
am
498d710a: modify sample template and add new css/script for new numbered code. The line numbers are included inside the <pre> block initially, but hidden, so this script moves the numbers to a separate block on the left and makes them non-selectable. Also includes
* commit '
498d710a4f66ec8b6fff4c965235f226b56cd2dd':
modify sample template and add new css/script for new numbered code. The line numbers are included inside the <pre> block initially, but hidden, so this script moves the numbers to a separate block on the left and makes them non-selectable. Also includes script for features like single-click to highlight a line of code and double-click to invoke the link for that line.
Scott Main [Wed, 21 Aug 2013 22:47:38 +0000 (15:47 -0700)]
modify sample template and add new css/script for new numbered code.
The line numbers are included inside the <pre> block initially, but
hidden, so this script moves the numbers to a separate block on
the left and makes them non-selectable. Also includes script for
features like single-click to highlight a line of code and double-click
to invoke the link for that line.
Change-Id: I17ebb1255ff036948028b4722cc8e9758fb96553
Scott Main [Wed, 21 Aug 2013 00:24:01 +0000 (17:24 -0700)]
am
8088dd2f: am
ad08f07c: new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we\'ll later update to handle the Google reference nav as well
* commit '
8088dd2f83ae17a1343de87750d39f8264d7b7bc':
new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we'll later update to handle the Google reference nav as well
Scott Main [Wed, 21 Aug 2013 00:21:31 +0000 (17:21 -0700)]
am
ad08f07c: new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we\'ll later update to handle the Google reference nav as well
* commit '
ad08f07cf2ece7a3711eafa382cf741134c69083':
new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we'll later update to handle the Google reference nav as well
Scott Main [Tue, 20 Aug 2013 23:49:57 +0000 (16:49 -0700)]
new version of script to build sidenav lists dynamically.
This is currently used only by the samples nav, but we'll
later update to handle the Google reference nav as well
Change-Id: I907ea8cb096148ba50808623ed872c8defc9a135
Dirk Dougherty [Mon, 19 Aug 2013 22:00:39 +0000 (15:00 -0700)]
am
62c755a5: am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
62c755a52a74dc2f887d51d48105eebff17a6346':
Clean up core css changes brought in with samples css.
Dirk Dougherty [Mon, 19 Aug 2013 21:57:19 +0000 (14:57 -0700)]
am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
f5ffd4a40c7a2165ff6ebe24a2aa189dea6b1806':
Clean up core css changes brought in with samples css.
Dirk Dougherty [Mon, 19 Aug 2013 19:26:07 +0000 (12:26 -0700)]
Clean up core css changes brought in with samples css.
Change-Id: I0920695be4f6ed7085508a4451c13bc7d9e65d9a
Dirk Dougherty [Mon, 19 Aug 2013 19:12:07 +0000 (12:12 -0700)]
am
d5ac8330: am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
d5ac833061b2233b71a60155656ca97cd5494746':
doc change: Samples browsing: basic support in templates and js/css.
Dirk Dougherty [Mon, 19 Aug 2013 19:09:46 +0000 (12:09 -0700)]
am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
4f7e5159409e71ecfeba86858f5ec044d043aff8':
doc change: Samples browsing: basic support in templates and js/css.
Dirk Dougherty [Thu, 16 Sep 2010 17:43:40 +0000 (10:43 -0700)]
doc change: Samples browsing: basic support in templates and js/css.
Change-Id: Ie2323f5323c624420c90c8c782b840f183238f7c
Scott Main [Thu, 15 Aug 2013 21:45:35 +0000 (14:45 -0700)]
am
7e453280: am
52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar w
* commit '
7e453280539406882215a0602ae6f63d7585fb9f':
fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
Scott Main [Thu, 15 Aug 2013 21:43:45 +0000 (14:43 -0700)]
am
52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appe
* commit '
52dd206715e9d8e80a22c7106ec783324d51e747':
fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
Scott Main [Thu, 15 Aug 2013 19:22:28 +0000 (12:22 -0700)]
fix two bugs in site script.
1. Fix URL path check for reference docs to initalize api level and sidenav.
Previously, this condition was never true, so the sidenav would not be initialized
under default conditions and the reference drag bar would not appear.
2. Fix the recent change to the 'scroll into view' script so that it works
properly in a multi-pane sidenav (reference docs) by again making the offset
measurement relative to the parent container (but much better than was done before).
Change-Id: I2a31ed59d772346651c2432f0ed26530983c49ff
Ying Wang [Thu, 15 Aug 2013 19:02:30 +0000 (12:02 -0700)]
resolved conflicts for merge of
d65a7da3 to jb-mr2-dev-plus-aosp
Change-Id: I14c4ddf5f02c8dec86f45bedf679bcebff1448dc
Ying Wang [Thu, 15 Aug 2013 18:55:46 +0000 (11:55 -0700)]
am
f4723fa4: No need to filter out AndroidConfig.h for unbundled build
* commit '
f4723fa49b6e61f727b6321a4006ee8ba3f393b9':
No need to filter out AndroidConfig.h for unbundled build
Ying Wang [Thu, 15 Aug 2013 18:01:10 +0000 (11:01 -0700)]
No need to filter out AndroidConfig.h for unbundled build
for now we have all AndroidConfig.hs in the build project.
Change-Id: Id713fecba1378fad81688f5937f61c779b618ac2
The Android Open Source Project [Wed, 14 Aug 2013 19:06:41 +0000 (12:06 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I61c47285d236337a033e001c3b84a9631895bc5b
Ying Wang [Wed, 14 Aug 2013 16:26:06 +0000 (09:26 -0700)]
am
b9eee184: am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
b9eee184f2ab291f5af6520c41f90a8857c4bd73':
Remove -allowaccessmodification from the basic Proguard flags
Ying Wang [Wed, 14 Aug 2013 16:22:01 +0000 (09:22 -0700)]
am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
e391e7a86e806bd3d2549b6d12736166fafb746f':
Remove -allowaccessmodification from the basic Proguard flags
Ying Wang [Wed, 14 Aug 2013 00:40:24 +0000 (17:40 -0700)]
Remove -allowaccessmodification from the basic Proguard flags
It seems with that flag Proguard modifies the class files in a way that
Dalvik does not like.
Bug:
10307364
Change-Id: If0cc7552da00ae8a3a3a39a9f2f029819ca3164a
The Android Automerger [Tue, 13 Aug 2013 22:20:55 +0000 (15:20 -0700)]
"JWR66Y"
The Android Open Source Project [Tue, 13 Aug 2013 17:09:56 +0000 (10:09 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
Change-Id: I80fa0805a168773ba273726fb4827b6cc24bfb08
The Android Automerger [Thu, 8 Aug 2013 23:53:41 +0000 (16:53 -0700)]
"JLS36B"
The Android Automerger [Wed, 7 Aug 2013 23:10:36 +0000 (16:10 -0700)]
JWR66X
The Android Automerger [Wed, 7 Aug 2013 23:02:33 +0000 (16:02 -0700)]
JSS15P
The Android Open Source Project [Wed, 7 Aug 2013 16:42:55 +0000 (09:42 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
Change-Id: Ib795b6944220a2b13f6def23ee279815e53ac6b4
The Android Automerger [Wed, 7 Aug 2013 03:33:52 +0000 (20:33 -0700)]
JWR66W
The Android Automerger [Wed, 7 Aug 2013 03:09:28 +0000 (20:09 -0700)]
JSS15O
The Android Automerger [Mon, 5 Aug 2013 22:25:41 +0000 (15:25 -0700)]
JLS36
The Android Automerger [Mon, 5 Aug 2013 18:12:19 +0000 (11:12 -0700)]
JSS15N
Ying Wang [Sat, 3 Aug 2013 00:40:59 +0000 (17:40 -0700)]
am
38775140: am
08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
* commit '
387751401ca83e4419444247a176f2ea1f35a50b':
Remove unnecessary dependencies between host and target modules.
Stephen Hines [Sat, 3 Aug 2013 00:40:58 +0000 (17:40 -0700)]
am
367e56f1: am
3fc8dacd: Remove abcc from build.
* commit '
367e56f1b7d79086785f61c8c522644f134c3136':
Remove abcc from build.
Ying Wang [Sat, 3 Aug 2013 00:39:01 +0000 (17:39 -0700)]
am
08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
* commit '
08c07c590322e1cbc8464dd371a2e5120b88e38d':
Remove unnecessary dependencies between host and target modules.
Stephen Hines [Sat, 3 Aug 2013 00:38:59 +0000 (17:38 -0700)]
am
3fc8dacd: Remove abcc from build.
* commit '
3fc8dacd9209a846de34edaee0dc14d50cae3d25':
Remove abcc from build.
Ying Wang [Fri, 2 Aug 2013 21:51:09 +0000 (21:51 +0000)]
Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
The Android Automerger [Fri, 2 Aug 2013 20:54:06 +0000 (13:54 -0700)]
"JSS15M"