author | amoghbl1 <amoghbl1@gmail.com> |
Tue, 15 Jul 2014 17:45:00 +0200 | |
changeset 194341 | 2899ce2438825db3e410b1bd1293cdd933c8cf7f |
parent 194340 | f701765f120713e96997544c6fe315485a1c9248 |
child 194342 | f6e46d1fc9039269f2d59ae4f43d3dc1c0b1e3de |
child 194343 | d56e8ef026a035fd5e6c69369d00255710d7ab3c |
push id | 27143 |
push user | cbook@mozilla.com |
push date | Wed, 16 Jul 2014 13:54:56 +0000 |
treeherder | mozilla-central@f6e46d1fc903 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | nalexander |
bugs | 755228 |
milestone | 33.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/mobile/android/base/tests/testAddSearchEngine.java +++ b/mobile/android/base/tests/testAddSearchEngine.java @@ -16,17 +16,17 @@ import android.widget.ListView; * Test adding a search engine from an input field context menu. * 1. Get the number of existing search engines from the SearchEngine:Data event and as displayed in about:home. * 2. Load a page with a text field, open the context menu and add a search engine from the page. * 3. Get the number of search engines after adding the new one and verify it has increased by 1. */ public class testAddSearchEngine extends AboutHomeTest { private final int MAX_WAIT_TEST_MS = 5000; private final String SEARCH_TEXT = "Firefox for Android"; - private final String ADD_SEARCHENGINE_OPTION_TEXT = "Add Search Engine"; + private final String ADD_SEARCHENGINE_OPTION_TEXT = "Add as Search Engine"; public void testAddSearchEngine() { String blankPageURL = getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_01_URL); String searchEngineURL = getAbsoluteUrl(StringHelper.ROBOCOP_SEARCH_URL); blockForGeckoReady(); int height = mDriver.getGeckoTop() + 150; int width = mDriver.getGeckoLeft() + 150;
--- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -6870,17 +6870,17 @@ var SearchEngines = { // POST multipart/form-data NO // POST everything else YES return (method == "GET" || method == "") || (form.enctype != "text/plain") && (form.enctype != "multipart/form-data"); } }; SelectionHandler.addAction({ id: "search_add_action", - label: Strings.browser.GetStringFromName("contextmenu.addSearchEngine"), + label: Strings.browser.GetStringFromName("contextmenu.addSearchEngine2"), icon: "drawable://ab_add_search_engine", selector: filter, action: function(aElement) { UITelemetry.addEvent("action.1", "actionbar", null, "add_search_engine"); SearchEngines.addEngine(aElement); } }); }, @@ -7075,17 +7075,17 @@ var SearchEngines = { formData.push({ name: escapedName, value: escapedValue }); break; } } } } // prompt user for name of search engine - let promptTitle = Strings.browser.GetStringFromName("contextmenu.addSearchEngine"); + let promptTitle = Strings.browser.GetStringFromName("contextmenu.addSearchEngine2"); let title = { value: (aElement.ownerDocument.title || docURI.host) }; if (!Services.prompt.prompt(null, promptTitle, null, title, null, {})) return; // fetch the favicon for this page let dbFile = FileUtils.getFile("ProfD", ["browser.db"]); let mDBConn = Services.storage.openDatabase(dbFile); let stmts = [];
--- a/mobile/android/locales/en-US/chrome/browser.properties +++ b/mobile/android/locales/en-US/chrome/browser.properties @@ -194,17 +194,17 @@ contextmenu.fullScreen=Full Screen contextmenu.copyImageLocation=Copy Image Location contextmenu.shareImage=Share Image # LOCALIZATION NOTE (contextmenu.search): # The label of the contextmenu item which allows you to search with your default search engine for # the text you have selected. %S is the name of the search engine. For example, "Google". contextmenu.search=%S Search contextmenu.saveImage=Save Image contextmenu.setImageAs=Set Image As -contextmenu.addSearchEngine=Add Search Engine +contextmenu.addSearchEngine2=Add as Search Engine contextmenu.playMedia=Play contextmenu.pauseMedia=Pause contextmenu.shareMedia=Share Video contextmenu.showControls2=Show Controls contextmenu.mute=Mute contextmenu.unmute=Unmute contextmenu.saveVideo=Save Video contextmenu.saveAudio=Save Audio