Merge fx-team to central, a=merge CLOSED

browser/components/loop/content/shared/css/conversation.css

@@ -993,8 +993,6 @@ body[platform="win"] .share-service-dropdown.overflow > .dropdown-menu-item {
 
 .room-context {
   background: #fff;
-  border-top: 2px solid #444;
-  border-bottom: 2px solid #444;
   position: absolute;
   left: 0;
   bottom: 0;
@@ -1036,11 +1034,6 @@ body[platform="win"] .share-service-dropdown.overflow > .dropdown-menu-item {
   text-shadow: 1px 1px 0 rgba(0,0,0,.3);
 }
 
-.room-context > .checkbox-wrapper {
-  margin-bottom: .5em;
-  width: 100%;
-}
-
 .room-context-header {
   color: #333;
   font-size: 1.2rem;
@@ -1048,26 +1041,6 @@ body[platform="win"] .share-service-dropdown.overflow > .dropdown-menu-item {
   margin: 1rem auto;
 }
 
-.room-context-comment {
-  color: #707070;
-}
-
-.room-context-comment {
-  word-wrap: break-word;
-}
-
-:not(input).room-context-url {
-  color: #0095dd;
-  font-style: italic;
-  text-decoration: none;
-  display: block;
-  cursor: pointer;
-}
-
-.room-context-url:hover {
-  text-decoration: underline;
-}
-
 .room-context > form {
   margin-bottom: 1rem;
   padding: .5rem;
@@ -1076,17 +1049,17 @@ body[platform="win"] .share-service-dropdown.overflow > .dropdown-menu-item {
 
 .room-context > form > textarea,
 .room-context > form > input[type="text"] {
-  display: block;
-  width: 100%;
-  outline: none;
-  border-radius: 4px;
-  margin: 10px 0;
   border: 1px solid #c3c3c3;
-  height: 2.6rem;
-  padding: 6px;
-  font-size: 1.1rem;
-  color: #4a4a4a;
+  border-radius: 4px;
   box-shadow: none;
+  color: #4a4a4a;
+  display: block;
+  font-size: 1.1rem;
+  height: 2.6rem;
+  margin: 10px 0;
+  outline: none;
+  padding: 6px;
+  width: 100%;
 }
 
 .room-context > form > textarea {

browser/components/loop/standalone/content/l10n/en-US/loop.properties

@@ -85,7 +85,7 @@ status_error=Something went wrong
 
 chat_textbox_placeholder=Type here…
 # LOCALIZATION NOTE (context_inroom_label2): this string is followed by the
-# title/URL of the website you are having a conversation about, displayed on a
+# title/domain of the website you are having a conversation about, displayed on a
 # separate line. If this structure doesn't work for your locale, you might want
 # to consider this as a stand-alone title. See example screenshot:
 # https://bug1084991.bugzilla.mozilla.org/attachment.cgi?id=8614721

browser/locales/en-US/chrome/browser/loop/loop.properties

@@ -32,6 +32,11 @@ first_time_experience_subheading=Join the conversation
 
 invite_header_text=Invite someone to join you.
 invite_header_text2=Invite a friend to join you
+## LOCALIZATION_NOTE(invite_facebook_button, invite_facebook_triggered,
+## invite_contacts_button, invite_contacts_triggered, invite_copy_button,
+## invite_copy_triggered, invite_email_button, invite_email_triggered): These
+## button/triggered pairs are labels under an iconic button that switch to the
+## triggered text when clicked/activated.
 invite_facebook_button=share on Facebook
 invite_facebook_triggered=shared!
 invite_contacts_button=share with contacts

mobile/android/base/BrowserApp.java

@@ -2753,6 +2753,7 @@ public class BrowserApp extends GeckoApp
         // checking if fragment is already present
         if (f != null) {
             fm.beginTransaction().show(f).commitAllowingStateLoss();
+            mBrowserSearch.resetScrollState();
         } else {
             // add fragment if not already present
             fm.beginTransaction().add(R.id.search_container, mBrowserSearch, BROWSER_SEARCH_TAG).commitAllowingStateLoss();

mobile/android/base/home/BrowserSearch.java

@@ -510,6 +510,10 @@ public class BrowserSearch extends HomeFragment
         return null;
     }
 
+    public void resetScrollState() {
+        mSearchEngineBar.scrollToPosition(0);
+    }
+
     private void filterSuggestions() {
         if (mSuggestClient == null || !mSuggestionsEnabled) {
             return;