merge in mnc-dr-release history after reset to mnc-dr-dev
diff --git a/core/build_id.mk b/core/build_id.mk
index 75e273f..0e8e2cf 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-export BUILD_ID=MDA08C
+export BUILD_ID=MASTER
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index feaf06b..d88c0e6 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -2101,9 +2101,8 @@
// Search for matching JD docs
if (text.length >= 2) {
- // Regex to match only the beginning of a word
- var textRegex = new RegExp("\\b" + text.toLowerCase(), "g");
-
+ // match only the beginning of a word
+ var queryStr = text.toLowerCase();
// Search for Training classes
for (var i=0; i<TRAINING_RESOURCES.length; i++) {
@@ -2117,7 +2116,7 @@
// Check if query matches any tags; work backwards toward 1 to assist ranking
for (var j = s.keywords.length - 1; j >= 0; j--) {
// it matches a tag
- if (s.keywords[j].toLowerCase().match(textRegex)) {
+ if (s.keywords[j].toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_tag = j + 1; // add 1 to index position
}
@@ -2127,7 +2126,7 @@
if ((s.lang == currentLang) &&
(!(s.type == "training" && s.url.indexOf("index.html") == -1) || matched)) {
// it matches the doc title
- if (s.title.toLowerCase().match(textRegex)) {
+ if (s.title.toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_title = 1;
}
@@ -2151,7 +2150,8 @@
// Check if query matches any tags; work backwards toward 1 to assist ranking
for (var j = s.keywords.length - 1; j >= 0; j--) {
// it matches a tag
- if (s.keywords[j].toLowerCase().match(textRegex)) {
+ if (s.keywords[j].toLowerCase().indexOf(queryStr) == 0) {
+
matched = true;
s.matched_tag = j + 1; // add 1 to index position
}
@@ -2159,7 +2159,7 @@
// Check if query matches the doc title, but only for current language
if (s.lang == currentLang) {
// if query matches the doc title
- if (s.title.toLowerCase().match(textRegex)) {
+ if (s.title.toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_title = 1;
}
@@ -2183,7 +2183,7 @@
// Check if query matches any tags; work backwards toward 1 to assist ranking
for (var j = s.keywords.length - 1; j >= 0; j--) {
// it matches a tag
- if (s.keywords[j].toLowerCase().match(textRegex)) {
+ if (s.keywords[j].toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_tag = j + 1; // add 1 to index position
}
@@ -2191,7 +2191,7 @@
// Check if query matches the doc title, but only for current language
if (s.lang == currentLang) {
// if query matches the doc title
- if (s.title.toLowerCase().match(textRegex)) {
+ if (s.title.toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_title = 1;
}
@@ -2215,7 +2215,7 @@
// Check if query matches any tags; work backwards toward 1 to assist ranking
for (var j = s.keywords.length - 1; j >= 0; j--) {
// it matches a tag
- if (s.keywords[j].toLowerCase().match(textRegex)) {
+ if (s.keywords[j].toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_tag = j + 1; // add 1 to index position
}
@@ -2223,7 +2223,7 @@
// Check if query matches the doc title, but only for current language
if (s.lang == currentLang) {
// if query matches the doc title
- if (s.title.toLowerCase().match(textRegex)) {
+ if (s.title.toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_title = 1;
}
@@ -2247,7 +2247,7 @@
// Check if query matches any tags; work backwards toward 1 to assist ranking
for (var j = s.keywords.length - 1; j >= 0; j--) {
// it matches a tag
- if (s.keywords[j].toLowerCase().match(textRegex)) {
+ if (s.keywords[j].toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_tag = j + 1; // add 1 to index position
}
@@ -2255,7 +2255,7 @@
// Check if query matches the doc title, but only for current language
if (s.lang == currentLang) {
// if query matches the doc title
- if (s.title.toLowerCase().match(textRegex)) {
+ if (s.title.toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_title = 1;
}
@@ -2279,7 +2279,7 @@
// Check if query matches any tags; work backwards toward 1 to assist ranking
for (var j = s.keywords.length - 1; j >= 0; j--) {
// it matches a tag
- if (s.keywords[j].toLowerCase().match(textRegex)) {
+ if (s.keywords[j].toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_tag = j + 1; // add 1 to index position
}
@@ -2287,7 +2287,7 @@
// Check if query matches the doc title, but only for current language
if (s.lang == currentLang) {
// if query matches the doc title
- if (s.title.toLowerCase().match(textRegex)) {
+ if (s.title.toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_title = 1;
}
@@ -2311,7 +2311,7 @@
// Check if query matches any tags; work backwards toward 1 to assist ranking
for (var j = s.keywords.length - 1; j >= 0; j--) {
// it matches a tag
- if (s.keywords[j].toLowerCase().match(textRegex)) {
+ if (s.keywords[j].toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_tag = j + 1; // add 1 to index position
}
@@ -2319,7 +2319,7 @@
// Check if query matches the doc title, but only for current language
if (s.lang == currentLang) {
// if query matches the doc title
- if (s.title.toLowerCase().match(textRegex)) {
+ if (s.title.toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_title = 1;
}
@@ -2342,7 +2342,7 @@
// Check if query matches any tags; work backwards toward 1 to assist ranking
for (var j = s.keywords.length - 1; j >= 0; j--) {
// it matches a tag
- if (s.keywords[j].toLowerCase().match(textRegex)) {
+ if (s.keywords[j].toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_tag = j + 1; // add 1 to index position
}
@@ -2350,7 +2350,7 @@
// Check if query matches the doc title, but only for current language
if (s.lang == currentLang) {
// if query matches the doc title.t
- if (s.title.toLowerCase().match(textRegex)) {
+ if (s.title.toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_title = 1;
}
@@ -2373,7 +2373,7 @@
// Check if query matches any tags; work backwards toward 1 to assist ranking
for (var j = s.keywords.length - 1; j >= 0; j--) {
// it matches a tag
- if (s.keywords[j].toLowerCase().match(textRegex)) {
+ if (s.keywords[j].toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_tag = j + 1; // add 1 to index position
}
@@ -2381,7 +2381,7 @@
// Check if query matches the doc title, but only for current language
if (s.lang == currentLang) {
// if query matches the doc title
- if (s.title.toLowerCase().match(textRegex)) {
+ if (s.title.toLowerCase().indexOf(queryStr) == 0) {
matched = true;
s.matched_title = 1;
}
diff --git a/tools/droiddoc/templates-sdk/docpage.cs b/tools/droiddoc/templates-sdk/docpage.cs
index 204e06c..668105b 100644
--- a/tools/droiddoc/templates-sdk/docpage.cs
+++ b/tools/droiddoc/templates-sdk/docpage.cs
@@ -194,10 +194,10 @@
<?cs include:"trailer.cs" ?>
<script src="https://developer.android.com/ytblogger_lists_unified.js" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_lists_unified.js?v=14" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_extras.js?v=14" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_collections.js?v=14" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_tag_helpers.js?v=14" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_lists_unified.js?v=15" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_extras.js?v=15" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_collections.js?v=15" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_tag_helpers.js?v=15" type="text/javascript"></script>
</body>
</html>
diff --git a/tools/droiddoc/templates-sdk/footer.cs b/tools/droiddoc/templates-sdk/footer.cs
index c960953..1ffee63 100644
--- a/tools/droiddoc/templates-sdk/footer.cs
+++ b/tools/droiddoc/templates-sdk/footer.cs
@@ -46,6 +46,7 @@
<option value="es">Español</option>
<option value="ja">日本語</option>
<option value="ko">한국어</option>
+ <option value="pt-br">Português Brasileiro</option>
<option value="ru">Русский</option>
<option value="zh-cn">中文（简体)</option>
<option value="zh-tw">中文（繁體)</option>
diff --git a/tools/droiddoc/templates-sdk/head_tag.cs b/tools/droiddoc/templates-sdk/head_tag.cs
index dfbff5a..babb3c7 100644
--- a/tools/droiddoc/templates-sdk/head_tag.cs
+++ b/tools/droiddoc/templates-sdk/head_tag.cs
@@ -65,7 +65,7 @@
var metaTags = [<?cs var:meta.tags ?>];
var devsite = <?cs if:devsite ?>true<?cs else ?>false<?cs /if ?>;
</script>
-<script src="<?cs var:toroot ?>assets/js/docs.js?v=5" type="text/javascript"></script>
+<script src="<?cs var:toroot ?>assets/js/docs.js?v=6" type="text/javascript"></script>
<?cs if:helpoutsWidget ?>
<script type="text/javascript" src="https://helpouts.google.com/ps/res/embed.js" defer async
