OSDN Git Service
The Android Automerger [Wed, 4 Sep 2013 13:00:30 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Dirk Dougherty [Tue, 3 Sep 2013 22:25:08 +0000 (15:25 -0700)]
am
70892395: am
d55fb681: am
6fb7e23b: Add file path above h1 in samplecode files.
* commit '
70892395bb48ffca762a47c9bb35c1ad9c3512dc':
Add file path above h1 in samplecode files.
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.
The Android Automerger [Tue, 3 Sep 2013 22:17:29 +0000 (15:17 -0700)]
"KRS65B"
The Android Automerger [Tue, 3 Sep 2013 13:00:46 +0000 (06:00 -0700)]
"KRS65"
The Android Automerger [Tue, 3 Sep 2013 13:00:07 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 2 Sep 2013 13:02:54 +0000 (06:02 -0700)]
"KRS64"
The Android Automerger [Mon, 2 Sep 2013 13:00:19 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 2 Sep 2013 09:32:54 +0000 (02:32 -0700)]
"KRS60H"
The Android Automerger [Sun, 1 Sep 2013 20:11:32 +0000 (13:11 -0700)]
"KRS60G"
Dirk Dougherty [Sat, 31 Aug 2013 02:06:57 +0000 (19:06 -0700)]
Add file path above h1 in samplecode files.
Change-Id: I91adb197b478ea476bbf0e07650486581c1ca8ec
The Android Automerger [Fri, 30 Aug 2013 22:06:11 +0000 (15:06 -0700)]
"KRS60F"
The Android Automerger [Fri, 30 Aug 2013 21:13:28 +0000 (14:13 -0700)]
"KRS60E"
The Android Automerger [Fri, 30 Aug 2013 18:22:50 +0000 (11:22 -0700)]
KRS60D
Torne (Richard Coles) [Fri, 30 Aug 2013 09:41:09 +0000 (09:41 +0000)]
Merge "Fix handling of .o files in LOCAL_GENERATED_SOURCES." into klp-dev
The Android Automerger [Thu, 29 Aug 2013 23:12:12 +0000 (16:12 -0700)]
"KRS60C"
The Android Automerger [Thu, 29 Aug 2013 21:29:55 +0000 (14:29 -0700)]
"KRS60B"
Jake Hamby [Thu, 29 Aug 2013 17:13:59 +0000 (10:13 -0700)]
Remove Moto OMA DM client from build tree.
Remove Moto OMA DM client from system image and intermediates.
Bug:
10455884
Change-Id: Idc0529d33911dc417f8f5b6db71808bf847eed3c
Torne (Richard Coles) [Thu, 29 Aug 2013 14:36:34 +0000 (15:36 +0100)]
Fix handling of .o files in LOCAL_GENERATED_SOURCES.
Rule-generated .o files (in gen_o_objects) were being given a dependency
on everything in LOCAL_GENERATED_SOURCES (except for other .o files);
unfortunately this can still create cycles in cases where there are
explicit dependencies between entries in LOCAL_GENERATED_SOURCES.
Instead, make handling of generated .o files consistent with other
generated files (which don't automatically get any dependencies on other
generated files) by excluding them from the target side of the rule.
Change-Id: I3fb5652dc3d85012c179a03b81887d16a85ab3bf
The Android Automerger [Thu, 29 Aug 2013 13:02:27 +0000 (06:02 -0700)]
"KRS60"
The Android Automerger [Thu, 29 Aug 2013 13:00:29 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Ying Wang [Thu, 29 Aug 2013 05:16:56 +0000 (22:16 -0700)]
am
cbea143e: am
019891c1: am
fc9cd4f5: Create an empty zip file if no dict file found.
* commit '
cbea143e94409ef941bbfb6c276d26199da46119':
Create an empty zip file if no dict file found.
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)
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
The Android Automerger [Thu, 29 Aug 2013 00:31:24 +0000 (17:31 -0700)]
"KRS59B"
Ying Wang [Thu, 29 Aug 2013 00:28:36 +0000 (17:28 -0700)]
Skip compiling Java if an apk has no Java code.
Change-Id: Iee204e03ad5bc8ce5c3b4b3863c19c89184826e2
Ying Wang [Wed, 28 Aug 2013 20:04:46 +0000 (13:04 -0700)]
Better handle of need_compile_java.
Change-Id: I609a27e2b35b08962243b6516c6c525c0c938d3c
Ying Wang [Wed, 28 Aug 2013 18:16:06 +0000 (11:16 -0700)]
Make it a fatal error if no source files for Java module.
Change-Id: Ia04158c11381b6b1687b9d5c699a9ea8ae3cb317
Clay Murphy [Wed, 28 Aug 2013 15:56:35 +0000 (15:56 +0000)]
Merge "Docs: Fixing link from logo in PDK Bug:
9177537 Staging location: claym.mtv.corp.google.com:8083/guide/getting_started.html" into klp-dev
The Android Automerger [Wed, 28 Aug 2013 13:02:07 +0000 (06:02 -0700)]
"KRS59"
The Android Automerger [Wed, 28 Aug 2013 13:00:14 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Clay Murphy [Tue, 27 Aug 2013 23:04:35 +0000 (16:04 -0700)]
Docs: Fixing link from logo in PDK
Bug:
9177537
Staging location:
http://claym.mtv.corp.google.com:8083/guide/getting_started.html
Change-Id: I4c4708a168688fdfc79468b955115d7f37df1bc2
Mathias Agopian [Tue, 27 Aug 2013 22:09:01 +0000 (22:09 +0000)]
Merge "fix uses of grep in envsetup.h" into klp-dev
Ying Wang [Tue, 27 Aug 2013 22:04:57 +0000 (15:04 -0700)]
In apps_only build dist a module only if it has a BUILT file.
This allows you to specify a PHONY target in TARGET_BUILD_APPS.
Change-Id: Idd813cd0dbdb14c705fbd3187596d4c64b99d045
The Android Automerger [Tue, 27 Aug 2013 22:01:37 +0000 (15:01 -0700)]
"KRS58B"
Mathias Agopian [Tue, 27 Aug 2013 21:15:50 +0000 (14:15 -0700)]
fix uses of grep in envsetup.h
make sure we don't use a grep alias if one exists.
Change-Id: Id8e394f5889d9a5f1d320ecb289c974da8f14207
The Android Automerger [Tue, 27 Aug 2013 13:03:15 +0000 (06:03 -0700)]
"KRS58"
The Android Automerger [Tue, 27 Aug 2013 13:00:58 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 26 Aug 2013 23:01:17 +0000 (16:01 -0700)]
"KRS57B"
Ying Wang [Mon, 26 Aug 2013 21:57:52 +0000 (14:57 -0700)]
Remove the vendor-specific vars from the protected list.
Change-Id: I915a61034c9c3e2b886f609c4b8f4043e97bda61
Dirk Dougherty [Mon, 26 Aug 2013 18:56:37 +0000 (11:56 -0700)]
am
13ab927a: am
2747bec3: am
981effcc: Add breadcrumb for sample code html pages.
* commit '
13ab927a81256c8cb03bcbd31344ae979ab78617':
Add breadcrumb for sample code html pages.
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
The Android Automerger [Mon, 26 Aug 2013 13:02:57 +0000 (06:02 -0700)]
"KRS57"
The Android Automerger [Mon, 26 Aug 2013 13:00:42 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Ying Wang [Fri, 23 Aug 2013 03:02:03 +0000 (20:02 -0700)]
Collect NOTICE files for apps_only build.
In apps_only build (after running tapas or exporting TARGET_BUILD_APPS),
run "make notice_files" to collect and combine the NOTICE files of
modules that are needed by the apps.
Bug:
10445634
Change-Id: I6555bba1104e43b48c723c82143c46d444a75e80
The Android Automerger [Fri, 23 Aug 2013 23:31:12 +0000 (16:31 -0700)]
KRS53G
The Android Automerger [Fri, 23 Aug 2013 22:49:31 +0000 (15:49 -0700)]
"KRS53F"
The Android Automerger [Fri, 23 Aug 2013 20:38:08 +0000 (13:38 -0700)]
"KRS53E"
Ying Wang [Fri, 23 Aug 2013 19:19:48 +0000 (12:19 -0700)]
am
b88ca53a: am
ddce2eb0: am
de32713f: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '
b88ca53a465ef004a60ceb9c4c641c3c997edeb5':
Collect and store proguard obfuscation dictionary files.
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:10:20 +0000 (12:10 -0700)]
am
29695daa: am
653a037d: am
638ce57a: Treat LOCAL_APK_LIBRARIES like shared Java libraries.
* commit '
29695daa9734a8dfb516b7ff2e35b2b263e6b37b':
Treat LOCAL_APK_LIBRARIES like shared Java libraries.
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:17:47 +0000 (10:17 -0700)]
am
2363485c: am
06de9f94: am
8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit '
2363485c2fb3f08d36e8cdbb2240b9c3993b470c':
Revert "Collect and store proguard obfuscation dictionary files."
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:12:26 +0000 (10:12 -0700)]
am
93b95dc4: am
aa87a11d: am
afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '
93b95dc4b9f9b4e04e8a0fac25c958d5c52266e4':
Collect and store proguard obfuscation dictionary files.
Ying Wang [Fri, 23 Aug 2013 17:12:26 +0000 (10:12 -0700)]
am
ec3c15e5: am
04c4d34d: am
7311a344: Make it easier to enable obfuscation and optimization.
* commit '
ec3c15e5c7c11cf3a831898f286c7eb7c216e50f':
Make it easier to enable obfuscation and optimization.
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
The Android Automerger [Fri, 23 Aug 2013 02:56:23 +0000 (19:56 -0700)]
"KRS53D"
Jeff Brown [Fri, 23 Aug 2013 01:37:11 +0000 (18:37 -0700)]
Remove input flinger stubs. (DO NOT MERGE)
Bug:
10446930
Change-Id: Ifea564dce9b7b2f8a792dde4119316211febfd59
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:39:35 +0000 (16:39 -0700)]
am
504dbfc3: am
fc8140d3: am
d4645ea9: remove project structure from sample landing pages
* commit '
504dbfc3b984e3e7981acba8f0b6e65348838bcd':
remove project structure from sample landing pages
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:32:12 +0000 (16:32 -0700)]
am
c120c3fe: 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 '
c120c3fecb193835d56beec245913111f2fc8e41':
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:32:12 +0000 (16:32 -0700)]
am
f1d5a3b1: 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 '
f1d5a3b117ca827c26d901875ac69e2fde0fb106':
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: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.
The Android Automerger [Thu, 22 Aug 2013 23:23:35 +0000 (16:23 -0700)]
"KRS53C"
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
The Android Automerger [Thu, 22 Aug 2013 20:49:18 +0000 (13:49 -0700)]
"KRS53B"
The Android Automerger [Thu, 22 Aug 2013 20:29:48 +0000 (13:29 -0700)]
"KRS3B"
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
The Android Automerger [Thu, 22 Aug 2013 13:03:34 +0000 (06:03 -0700)]
"KRS53"
The Android Automerger [Thu, 22 Aug 2013 13:00:35 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Scott Main [Thu, 22 Aug 2013 00:44:52 +0000 (17:44 -0700)]
am
fa704681: 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-
* commit '
fa704681f9109eb25e19ab4eeb53636e92501c55':
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: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