Bug 1010741 - Change toolbar hint to "Search or enter address" (r=margaret)

mobile/android/base/locales/en-US/android_strings.dtd

@@ -34,7 +34,7 @@
 
 <!ENTITY choose_file "Choose File">
 
-<!ENTITY url_bar_default_text "Enter Search or Address">
+<!ENTITY url_bar_default_text2 "Search or enter address">
 
 <!ENTITY bookmark "Bookmark">
 <!ENTITY bookmark_added "Bookmark added">

mobile/android/base/strings.xml.in

@@ -67,7 +67,7 @@
 
   <string name="choose_file">&choose_file;</string>
 
-  <string name="url_bar_default_text">&url_bar_default_text;</string>
+  <string name="url_bar_default_text">&url_bar_default_text2;</string>
 
   <!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/ -->
   <string name="help_link">https://support.mozilla.org/1/mobile/&formatS1;/&formatS2;/&formatS3;/</string>

mobile/android/base/tests/StringHelper.java

@@ -58,7 +58,7 @@ public class StringHelper {
         "Add to Home Screen"
     };
 
-    public static final String TITLE_PLACE_HOLDER = "Enter Search or Address";
+    public static final String TITLE_PLACE_HOLDER = "Search or enter address";
 
     // Robocop page urls
     // Note: please use getAbsoluteUrl(String url) on each robocop url to get the correct url

mobile/android/base/tests/testImportFromAndroid.java

@@ -130,7 +130,7 @@ public class testImportFromAndroid extends AboutHomeTest {
     }
 
     private void importDataFromAndroid() {
-        waitForText("Enter Search or Address");
+        waitForText(StringHelper.TITLE_PLACE_HOLDER);
         selectSettingsItem(StringHelper.CUSTOMIZE_SECTION_LABEL, StringHelper.IMPORT_FROM_ANDROID_LABEL);
 
         // Wait for the Import form Android pop-up to be opened. It has the same title as the option so waiting for the "Cancel" button
@@ -155,7 +155,7 @@ public class testImportFromAndroid extends AboutHomeTest {
         waitForText("Privacy"); // Settings is a header for the settings menu page. Waiting for Privacy ensures we are back in the top Settings view
         mActions.sendSpecialKey(Actions.SpecialKey.BACK); // Exit Settings
         // Make sure the settings menu has been closed.
-        mAsserter.ok(mSolo.waitForText("Enter Search or Address"), "Waiting for search bar", "Search bar found");
+        mAsserter.ok(mSolo.waitForText(StringHelper.TITLE_PLACE_HOLDER), "Waiting for search bar", "Search bar found");
 
     }