Merge "Docs: Replace custom search engine Bug: 25778395" (2635974e) · Commits · e / os / android_build

tools/droiddoc/templates-sac/assets/css/default.css

+89 −1

Original line number	Diff line number	Diff line
		@@ -2208,6 +2208,7 @@ a:visited,
		#nav-swap {
		height:30px;
		border-top:1px solid #ccc;
		display: none;
		}
		#nav-swap a {
		display:inline-block;
		@@ -2242,6 +2243,10 @@ a:visited,
		margin-left:0;
		}

		#nav-tree, #swapper {
		display: none;
		}

		#nav-tree ul {
		list-style:none;
		padding:0;
		@@ -2336,11 +2341,13 @@ a:visited,
		border-bottom: 1px solid #CCC;
		background:#e9e9e9;
		background: rgba(0, 0, 0, 0.05); /* matches #nav li.expanded */
		display: none;

		}
		#api-nav-title {
		padding:0 5px;
		white-space:nowrap;
		display: none;
		}

		#api-level-toggle {
		@@ -3580,8 +3587,9 @@ EndColorStr='#ececec');
		border-color: #33b5e5;
		}

		// Fudging this so SAC looks OK
		.develop #header .wrap {
		border-color: #F80;
		border-color: #CCC;
		}

		.distribute #header .wrap {
		@@ -4568,3 +4576,83 @@ a.download-sdk {
		.annotation-message {
		display: block;
		}

		.dac-custom-search {
		background: #fff;
		margin: 0 -10px;
		padding: 20px 10px;
		z-index: 1;
		}

		.dac-custom-search .dac-fab, .dac-custom-search .dac-button-social {
		top: -48px;
		}

		.dac-custom-search-section-title {
		color: #505050;
		}

		.dac-custom-search-entry {
		margin-bottom: 36px;
		margin-top: 24px;
		margin-left: 0em;
		}

		.dac-custom-search-image {
		background-size: cover;
		height: 112px;
		}

		.dac-custom-search-title {
		color: #333;
		font-size: 14px;
		font-weight: 700;
		line-height: 0px;
		padding: 0;
		margin: 1em 0em 1em 0em;
		}

		.dac-custom-search-title a {
		color: inherit;
		}

		.dac-custom-search-section {
		color: #999;
		font-size: 16px;
		font-variant: small-caps;
		font-weight: 700;
		margin: -5px 0 0 0;
		}

		.dac-custom-search-snippet {
		color: #666;
		margin: 0em 0em .25em 0em;
		}

		.dac-custom-search-link {
		font-weight: 500;
		word-wrap: break-word;
		width: 100%;
		}

		.dac-custom-search-load-more {
		background: none;
		border: none;
		color: #333;
		cursor: pointer;
		display: block;
		font-size: 14px;
		font-weight: 700;
		margin: 75px auto;
		outline: none;
		padding: 10px;
		}

		.dac-custom-search-load-more:hover {
		opacity: 0.7;
		}

		.dac-custom-search-no-results {
		color: #999;
		}

tools/droiddoc/templates-sac/assets/js/docs.js

+141 −72

Original line number	Diff line number	Diff line
		@@ -1630,7 +1630,10 @@ function search_changed(e, kd, toroot)
		} else {
		// otherwise, results are already showing, so allow ajax to auto refresh the results
		// and ignore this Enter press to avoid the reload.
		return false;
		// return false;
		//
		// For now, we're not using AJAX so we respond to every Enter.
		return true;
		}
		} else if (kd && gSelectedIndex >= 0) {
		window.location = $("a",$('#search_filtered li')[gSelectedIndex]).attr("href");
		@@ -1691,6 +1694,11 @@ function search_changed(e, kd, toroot)


		// Search for Google matches
		/*
		* Commented this out because GOOGLE_DATA not defined for us and code
		* causes an error. This probably has to do with the missing
		* gms_lists.js file in SAC. TODO figure it all out.
		*
		for (var i=0; i<GOOGLE_DATA.length; i++) {
		var s = GOOGLE_DATA[i];
		if (text.length != 0 &&
		@@ -1703,6 +1711,7 @@ function search_changed(e, kd, toroot)
		for (var i=0; i<gGoogleMatches.length; i++) {
		var s = gGoogleMatches[i];
		}
		*/

		highlight_autocomplete_result_labels(text);
		sync_selection_table(toroot);
		@@ -1830,81 +1839,138 @@ function hideResults() {
		$("#search_autocomplete").val("").blur();

		// reset the ajax search callback to nothing, so results don't appear unless ENTER
		searchControl.setSearchStartingCallback(this, function(control, searcher, query) {});
		// searchControl.setSearchStartingCallback(this, function(control, searcher, query) {});
		return false;
		}



		/* ########################################################## */
		/* ################ CUSTOM SEARCH ENGINE ################## */
		/* ########################################################## */

		google.load('search', '1');
		var searchControl;
		// TODO, add localized search.
		function getLangPref() {
		return "en";
		}

		function loadSearchResults() {
		document.getElementById("search_autocomplete").style.color = "#000";
		// Package of functions that does custom search, from DAC redesign.
		(function($) {
		var LANG;

		// create search control
		searchControl = new google.search.SearchControl();
		function getSearchLang() {
		if (!LANG) {
		LANG = getLangPref();

		// use our existing search form and use tabs when multiple searchers are used
		drawOptions = new google.search.DrawOptions();
		drawOptions.setDrawMode(google.search.SearchControl.DRAW_MODE_TABBED);
		drawOptions.setInput(document.getElementById("search_autocomplete"));
		// Fix zh-cn to be zh-CN.
		LANG = LANG.replace(/-\w+/, function(m) { return m.toUpperCase(); });
		}
		return LANG;
		}

		// configure search result options
		searchOptions = new google.search.SearcherOptions();
		searchOptions.setExpandMode(GSearchControl.EXPAND_MODE_OPEN);
		function customSearch(query, start) {
		var searchParams = {
		// Keys for SAC
		cx:'016258643462168859875:qqpm8fiwgc0',
		key: 'AIzaSyBOWHD3JAF6Q9LIJ4NiahGAF70W7iDAI9M',

		// Configure s.a.c searchers
		sacSiteSearcher = new google.search.WebSearch();
		sacSiteSearcher.setUserDefinedLabel("All");
		sacSiteSearcher.setSiteRestriction("http://source.android.com/");
		// Keys for DAC
		// cx: '000521750095050289010:zpcpi1ea4s8',
		// key: 'AIzaSyCFhbGnjW06dYwvRCU8h_zjdpS4PYYbEe8',

		sourceSearcher = new google.search.WebSearch();
		sourceSearcher.setUserDefinedLabel("Source");
		sourceSearcher.setSiteRestriction("http://source.android.com/source/");
		q: query,
		start: start \|\| 1,
		num: 6,
		hl: getSearchLang(),
		fields: 'queries,items(pagemap,link,title,htmlSnippet,formattedUrl)'
		};

		devicesSearcher = new google.search.WebSearch();
		devicesSearcher.setUserDefinedLabel("Devices");
		devicesSearcher.setSiteRestriction("http://source.android.com/devices/");
		return $.get('https://content.googleapis.com/customsearch/v1?' + $.param(searchParams));
		}

		securitySearcher = new google.search.WebSearch();
		securitySearcher.setUserDefinedLabel("Security");
		securitySearcher.setSiteRestriction("http://source.android.com/security/");
		function renderResults(el, results) {
		if (!results.items) {
		el.append($('<div>').text('No results'));
		return;
		}

		compatibilitySearcher = new google.search.WebSearch();
		compatibilitySearcher.setUserDefinedLabel("Compatibility");
		compatibilitySearcher.setSiteRestriction("http://source.android.com/compatibility/");
		for (var i = 0; i < results.items.length; i++) {
		var item = results.items[i];
		// No thumbnail images in SAC.
		// var hasImage = item.pagemap && item.pagemap.cse_thumbnail;
		var sectionMatch = item.link.match(/source\.android\.com\/(\w*)/);
		var section = (sectionMatch && sectionMatch[1]) \|\| 'blog';

		// add each searcher to the search control
		searchControl.addSearcher(sacSiteSearcher, searchOptions);
		searchControl.addSearcher(sourceSearcher, searchOptions);
		searchControl.addSearcher(devicesSearcher, searchOptions);
		searchControl.addSearcher(securitySearcher, searchOptions);
		searchControl.addSearcher(compatibilitySearcher, searchOptions);
		var entry = $('<div>').addClass('dac-custom-search-entry cols');

		// No thumbnail images in SAC.
		// if (hasImage) {
		// var image = item.pagemap.cse_thumbnail[0];
		// entry.append($('<div>').addClass('col-1of6')
		// .append($('<div>').addClass('dac-custom-search-image').css('background-image', 'url(' + image.src + ')')));
		// }
		// entry.append($('<div>').addClass(hasImage ? 'col-5of6' : 'col-6of6')
		entry.append($('<div>')
		.append($('<p>').addClass('dac-custom-search-section').text(section))
		.append(
		$('<a>').text(item.title).attr('href', item.link).wrap('<h2>').parent().addClass('dac-custom-search-title')
		)
		.append($('<p>').addClass('dac-custom-search-snippet').html(item.htmlSnippet.replace(/<br>/g, '')))
		.append($('<a>').addClass('dac-custom-search-link').text(item.formattedUrl).attr('href', item.link)));

		el.append(entry);
		}

		if (results.queries.nextPage) {
		var loadMoreButton = $('<button id="dac-custom-search-load-more">')
		.addClass('dac-custom-search-load-more')
		.text('Load more')
		.click(function() {
		loadMoreResults(el, results);
		});

		// configure result options
		searchControl.setResultSetSize(google.search.Search.LARGE_RESULTSET);
		searchControl.setLinkTarget(google.search.Search.LINK_TARGET_SELF);
		searchControl.setTimeoutInterval(google.search.SearchControl.TIMEOUT_SHORT);
		searchControl.setNoResultsString(google.search.SearchControl.NO_RESULTS_DEFAULT_STRING);
		el.append(loadMoreButton);
		}
		}

		// upon ajax search, refresh the url and search title
		searchControl.setSearchStartingCallback(this, function(control, searcher, query) {
		updateResultTitle(query);
		var query = document.getElementById('search_autocomplete').value;
		location.hash = 'q=' + query;
		function loadMoreResults(el, results) {
		var query = results.queries.request.searchTerms;
		var start = results.queries.nextPage.startIndex;
		var loadMoreButton = el.find('#dac-custom-search-load-more');

		loadMoreButton.text('Loading more...');

		customSearch(query, start).then(function(results) {
		loadMoreButton.remove();
		renderResults(el, results);
		});
		}

		$.fn.customSearch = function(query) {
		var el = $(this);

		customSearch(query).then(function(results) {
		el.empty();
		renderResults(el, results);
		});
		};
		})(jQuery);


		function loadSearchResults() {

		// draw the search results box
		searchControl.draw(document.getElementById("leftSearchControl"), drawOptions);
		// Draw the search results box
		//searchControl.draw(document.getElementById("leftSearchControl"), drawOptions);
		$(searchResults).append('<div class="leftSearchControl"></div>');


		// Refresh the url and search title
		var query = document.getElementById('search_autocomplete').value \|\| getQuery(location.hash);
		updateResultTitle(query);
		location.hash = 'q=' + query;

		// get query and execute the search
		searchControl.execute(decodeURI(getQuery(location.hash)));
		//searchControl.execute(decodeURI(getQuery(location.hash)));
		$(leftSearchControl).customSearch(getQuery(location.hash));

		document.getElementById("search_autocomplete").focus();
		addTabListeners();
		@@ -1912,7 +1978,9 @@ function loadSearchResults() {
		// End of loadSearchResults

		google.setOnLoadCallback(function(){
		if (location.hash.indexOf("q=") == -1) {

		var query = decodeURI(getQuery(location.hash));
		if (location.hash.indexOf("q=") == -1 \|\| query == '') {
		// if there's no query in the url, don't search and make sure results are hidden
		$('#searchResults').hide();
		return;
		@@ -1937,7 +2005,8 @@ $(window).hashchange( function(){

		// Otherwise, we have a search to do
		var query = decodeURI(getQuery(location.hash));
		searchControl.execute(query);
		//searchControl.execute(query);
		$('#leftSearchControl').customSearch(query);
		$('#searchResults').slideDown('slow');
		$("#search_autocomplete").focus();
		$(".search .close").removeClass("hide");
		@@ -1946,7 +2015,10 @@ $(window).hashchange( function(){
		});

		function updateResultTitle(query) {
		$("#searchTitle").html("Results for <em>" + escapeHTML(query) + "</em>");
		$("#searchTitle").html("Results for <em>" + (query) + "</em>");
		// For some reason, the escapeHTML function wasn't working for me. TODO fix
		// this by copying in a comparable library function.
		// $("#searchTitle").html("Results for <em>" + escapeHTML(query) + "</em>");
		}

		// forcefully regain key-up event control (previously jacked by search api)
		@@ -1991,11 +2063,6 @@ function escapeHTML(string) {
		}







		/* ######################################################## */
		/* ################# JAVADOC REFERENCE ################### */
		/* ######################################################## */
		@@ -2077,7 +2144,9 @@ function buildApiLevelSelector() {

		// get the DOM element and use setAttribute cuz IE6 fails when using jquery .attr('selected',true)
		var selectedLevelItem = $("#apiLevelSelector option[value='"+userApiLevel+"']").get(0);
		selectedLevelItem.setAttribute('selected',true);
		// Another piece of functionality that we don't use that produces an error.
		// TODO figure it all out.
		// selectedLevelItem.setAttribute('selected',true);
		}

		function changeApiLevel() {