Merge "Call aapt2 link with argument-list" into nyc-dev
diff --git a/core/definitions.mk b/core/definitions.mk
index b4cb635..5c01bc2 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2471,13 +2471,15 @@
# Align STORED entries of a package on 4-byte boundaries to make them easier to mmap.
#
define align-package
-$(hide) mv $@ $@.unaligned
-$(hide) $(ZIPALIGN) \
+$(hide) if ! $(ZIPALIGN) -c $(ZIPALIGN_PAGE_ALIGN_FLAGS) 4 $@ >/dev/null ; then \
+ mv $@ $@.unaligned; \
+ $(ZIPALIGN) \
-f \
$(ZIPALIGN_PAGE_ALIGN_FLAGS) \
4 \
- $@.unaligned $@.aligned
-$(hide) mv $@.aligned $@
+ $@.unaligned $@.aligned; \
+ mv $@.aligned $@; \
+ fi
endef
# Remove dynamic timestamps from packages
diff --git a/tools/droiddoc/templates-sdk-dev/head_tag.cs b/tools/droiddoc/templates-sdk-dev/head_tag.cs
index 549311d..c3ae93d 100644
--- a/tools/droiddoc/templates-sdk-dev/head_tag.cs
+++ b/tools/droiddoc/templates-sdk-dev/head_tag.cs
@@ -5,11 +5,11 @@
if:devsite ?>
<meta name="top_category" value="<?cs
if:ndk ?>ndk<?cs
- elif:(guide||develop||training||reference||tools||sdk||google||reference.gms||reference.gcm||samples) ?>develop<?cs
+ elif:(guide||develop||training||reference||tools||sdk||google||reference.gms||reference.gcm||samples||preview) ?>develop<?cs
+ elif:(go||libraries) ?>develop<?cs
elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories||analyze) ?>distribute<?cs
elif:(design||vision||material||patterns||devices||designdownloads) ?>design<?cs
elif:(about||versions||wear||tv||auto) ?>about<?cs
- elif:preview ?>preview<?cs
else ?>none<?cs
/if ?>" />
<?cs set:dac_subcategory_set = #1 ?>
@@ -34,6 +34,9 @@
if:(samplesDocPage&&!samplesProjectIndex) ?> samples-docpage<?cs /if ?><?cs
else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs
elif:(google||reference.gms||reference.gcm) ?>google<?cs
+ elif:(go||libraries) ?><?cs
+ if:libraries ?>libraries<?cs
+ else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs
elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories||analyze) ?><?cs
if:googleplay ?>googleplay<?cs
elif:essentials ?>essentials<?cs
@@ -69,6 +72,8 @@
elif:sdk ?>/tools<?cs
elif:samples ?>/samples<?cs /if ?><?cs
elif:(google||reference.gms||reference.gcm) ?>/google<?cs
+ elif:(go||libraries) ?>/go<?cs
+ if:libraries ?>/libraries<?cs /if ?><?cs
elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories||analyze) ?>/distribute<?cs
if:googleplay ?>/googleplay<?cs
elif:essentials ?>/essentials<?cs
diff --git a/tools/droiddoc/templates-sdk-dev/sdkpage.cs b/tools/droiddoc/templates-sdk-dev/sdkpage.cs
index b0c4d39..452e87c 100644
--- a/tools/droiddoc/templates-sdk-dev/sdkpage.cs
+++ b/tools/droiddoc/templates-sdk-dev/sdkpage.cs
@@ -449,7 +449,7 @@
idname = bundlename + "-size";
sizeMB = $(idname).text().split(' MB')[0];
$('.download-bundle-button > .small').html(" for " + os + " <em>(" + sizeMB + " MB)</em>");
- $('.download-bundle-button').click(function() {return onDownload(this,true,true);}).attr('href', bundlename);
+ $('.download-bundle-button').click(function() { onDownload(this,true,true);}).attr('href', bundlename);
}
@@ -581,11 +581,14 @@
</div><!-- end g-unit -->
<?cs include:"trailer.cs" ?>
+<?cs if:!devsite ?>
<script src="https://developer.android.com/ytblogger_lists_unified.js?v=17" type="text/javascript"></script>
<script src="/jd_lists_unified.js?v=17" type="text/javascript"></script>
<script src="/jd_extras.js?v=17" type="text/javascript"></script>
<script src="/jd_collections.js?v=17" type="text/javascript"></script>
<script src="/jd_tag_helpers.js?v=17" type="text/javascript"></script>
+<?cs /if ?><!--end !devsite -->
+
<!-- Start of Tag -->
<script type="text/javascript">
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index ee3ebee..d6aa351 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -21,6 +21,8 @@
$(document).ready(function() {
+ showStudioSurveyButton();
+
// show lang dialog if the URL includes /intl/
//if (location.pathname.substring(0,6) == "/intl/") {
// var lang = location.pathname.split('/')[2];
@@ -5375,3 +5377,17 @@
$(document)
.on('click.toggle', '[data-toggle="section"]', Toggle.prototype.toggle);
})(jQuery);
+
+
+var STUDIO_SURVEY_CLICKED = 'studio-survey-20160429-clicked';
+
+function onClickStudioSurvey() {
+ localStorage.setItem(STUDIO_SURVEY_CLICKED, 'true');
+ $("#studio-survey-button").fadeOut();
+}
+
+function showStudioSurveyButton() {
+ if (localStorage.getItem(STUDIO_SURVEY_CLICKED) == null) {
+ $("#studio-survey-button").show();
+ }
+}
\ No newline at end of file
diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index e17612d..63dc829 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -86,7 +86,13 @@
<span class="dac-sprite dac-google-play"></span>
<span class="dac-visible-desktop-inline">Developer</span>
Console
- </a><?cs /if ?>
+ </a>
+ <a class="dac-header-console-btn" id="studio-survey-button"
+ href="http://goo.gl/forms/dOQUuzwBsX"
+ onclick="onClickStudioSurvey()"
+ target="_blank" style="background:#FFE0B2;display:none"
+ >Take a 1 min survey</a>
+ <?cs /if ?>
</div><!-- end header-wrap.wrap -->
</div><!-- end header -->