Merge m-c to inbound. a=merge

b2g/chrome/content/settings.js

@@ -6,6 +6,8 @@
 
 "use strict";
 
+window.performance.mark('gecko-settings-loadstart');
+
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;

b2g/chrome/content/shell.html

@@ -16,7 +16,10 @@
 #ifdef FXOS_SIMULATOR
   <link rel="stylesheet" href="desktop.css" type="text/css">
 #endif
-
+  <script type="text/javascript">
+  <!-- Add raptor performance marker -->
+  window.performance.mark('gecko-shell-html-load');
+  </script>
   <script type="application/javascript;version=1.8"
           src="chrome://b2g/content/settings.js"> </script>
   <script type="application/javascript;version=1.8"

b2g/chrome/content/shell.js

@@ -4,6 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+window.performance.mark('gecko-shell-loadstart');
+
 Cu.import('resource://gre/modules/ContactService.jsm');
 Cu.import('resource://gre/modules/DataStoreChangeNotifier.jsm');
 Cu.import('resource://gre/modules/AlarmService.jsm');
@@ -75,6 +77,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing",
               "resource://gre/modules/SafeBrowsing.jsm");
 #endif
 
+window.performance.measure('gecko-shell-jsm-loaded', 'gecko-shell-loadstart');
+
 function getContentWindow() {
   return shell.contentBrowser.contentWindow;
 }
@@ -228,6 +232,7 @@ var shell = {
   },
 
   bootstrap: function() {
+    window.performance.mark('gecko-shell-bootstrap');
     let startManifestURL =
       Cc['@mozilla.org/commandlinehandler/general-startup;1?type=b2gbootstrap']
         .getService(Ci.nsISupports).wrappedJSObject.startManifestURL;
@@ -242,6 +247,7 @@ var shell = {
   },
 
   start: function shell_start() {
+    window.performance.mark('gecko-shell-start');
     this._started = true;
 
     // This forces the initialization of the cookie service before we hit the
@@ -372,6 +378,8 @@ var shell = {
     this.contentBrowser.src = homeURL;
     this.isHomeLoaded = false;
 
+    window.performance.mark('gecko-shell-system-frame-set');
+
     ppmm.addMessageListener("content-handler", this);
     ppmm.addMessageListener("dial-handler", this);
     ppmm.addMessageListener("sms-handler", this);
@@ -647,6 +655,7 @@ var shell = {
   },
 
   notifyContentStart: function shell_notifyContentStart() {
+    window.performance.mark('gecko-shell-notify-content-start');
     this.contentBrowser.removeEventListener('mozbrowserloadstart', this, true);
     this.contentBrowser.removeEventListener('mozbrowserlocationchange', this, true);
 

b2g/config/aries/sources.xml

@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

b2g/config/dolphin/sources.xml

@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

b2g/config/emulator-ics/sources.xml

@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="87a2d8ab9248540910e56921654367b78a587095"/>

b2g/config/emulator-jb/sources.xml

@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="49192a4e48d080e44a0d66f059e6897f07cf67f8"/>

b2g/config/emulator-kk/sources.xml

@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

b2g/config/emulator-l/sources.xml

@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

b2g/config/emulator/sources.xml

@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="87a2d8ab9248540910e56921654367b78a587095"/>

b2g/config/flame-kk/sources.xml

@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

b2g/config/gaia.json

@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "26b853b7cf94ea9e9ac6f20c55db462bd213a959", 
+        "git_revision": "858764a56982eb558259ccc689bbee855f090085", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "f7729852bdfb3f7051829e28463868a151c8ae62", 
+    "revision": "d43e6298ab2fc2d3033dac41d38138f9117ab9d3", 
     "repo_path": "integration/gaia-central"
 }

b2g/config/nexus-4/sources.xml

@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="49192a4e48d080e44a0d66f059e6897f07cf67f8"/>

b2g/config/nexus-5-l/sources.xml

@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

browser/components/loop/test/desktop-local/index.html

@@ -19,6 +19,13 @@
     window.addEventListener("error", function(error) {
       uncaughtError = error;
     });
+    var consoleWarn = console.warn;
+    var caughtWarnings = [];
+    console.warn = function() {
+      var args = Array.slice(arguments);
+      caughtWarnings.push(args);
+      consoleWarn.apply(console, args);
+    };
   </script>
 
   <!-- libs -->
@@ -88,6 +95,12 @@
       });
     });
 
+    describe("Unexpected Warnings Check", function() {
+      it("should long only the warnings we expect", function() {
+        chai.expect(caughtWarnings.length).to.eql(128);
+      });
+    });
+
     mocha.run(function () {
       $("#mocha").append("<p id='complete'>Complete.</p>");
     });

browser/components/loop/test/shared/index.html

@@ -19,6 +19,13 @@
     window.addEventListener("error", function(error) {
       uncaughtError = error;
     });
+    var consoleWarn = console.warn;
+    var caughtWarnings = [];
+    console.warn = function() {
+      var args = Array.slice(arguments);
+      caughtWarnings.push(args);
+      consoleWarn.apply(console, args);
+    };
   </script>
 
   <!-- libs -->
@@ -87,6 +94,12 @@
       });
     });
 
+    describe("Unexpected Warnings Check", function() {
+      it("should long only the warnings we expect", function() {
+        chai.expect(caughtWarnings.length).to.eql(183);
+      });
+    });
+
     mocha.run(function () {
       $("#mocha").append("<p id='complete'>Complete.</p>");
     });

browser/components/loop/test/standalone/index.html

@@ -20,6 +20,13 @@
     window.addEventListener("error", function(error) {
       uncaughtError = error;
     });
+    var consoleWarn = console.warn;
+    var caughtWarnings = [];
+    console.warn = function() {
+      var args = Array.slice(arguments);
+      caughtWarnings.push(args);
+      consoleWarn.apply(console, args);
+    };
   </script>
 
   <!-- libs -->
@@ -79,6 +86,12 @@
       });
     });
 
+    describe("Unexpected Warnings Check", function() {
+      it("should long only the warnings we expect", function() {
+        chai.expect(caughtWarnings.length).to.eql(37);
+      });
+    });
+
     mocha.run(function () {
       $("#mocha").append("<p id='complete'>Complete.</p>");
     });

browser/components/loop/ui/ui-showcase.js

@@ -421,8 +421,8 @@
     shapes: {
       "10x10": ["close", "close-active", "close-disabled", "dropdown",
         "dropdown-white", "dropdown-active", "dropdown-disabled", "edit",
-        "edit-active", "edit-disabled", "expand", "expand-active", "expand-disabled",
-        "minimize", "minimize-active", "minimize-disabled"
+        "edit-active", "edit-disabled", "edit-white", "expand", "expand-active",
+        "expand-disabled", "minimize", "minimize-active", "minimize-disabled"
       ],
       "14x14": ["audio", "audio-active", "audio-disabled", "facemute",
         "facemute-active", "facemute-disabled", "hangup", "hangup-active",
@@ -1282,6 +1282,15 @@
   });
 
   window.addEventListener("DOMContentLoaded", function() {
+    var uncaughtError;
+    var consoleWarn = console.warn;
+    var caughtWarnings = [];
+    console.warn = function() {
+      var args = Array.slice(arguments);
+      caughtWarnings.push(args);
+      consoleWarn.apply(console, args);
+    };
+
     try {
       React.renderComponent(React.createElement(App, null), document.getElementById("main"));
 
@@ -1304,12 +1313,23 @@
 
       // This simulates the mocha layout for errors which means we can run
       // this alongside our other unit tests but use the same harness.
-      if (uncaughtError) {
-        $("#results").append("<div class='failures'><em>1</em></div>");
-        $("#results").append("<li class='test fail'>" +
-          "<h2>Errors rendering UI-Showcase</h2>" +
-          "<pre class='error'>" + uncaughtError + "\n" + uncaughtError.stack + "</pre>" +
-          "</li>");
+      var expectedWarningsCount = 53;
+      var warningsMismatch = caughtWarnings.length !== expectedWarningsCount;
+      if (uncaughtError || warningsMismatch) {
+        $("#results").append("<div class='failures'><em>" +
+          (!!(uncaughtError && warningsMismatch) ? 2 : 1) + "</em></div>");
+        if (warningsMismatch) {
+          $("#results").append("<li class='test fail'>" +
+            "<h2>Unexpected number of warnings detected in UI-Showcase</h2>" +
+            "<pre class='error'>Got: " + caughtWarnings.length + "\n" +
+            "Expected: " + expectedWarningsCount + "</pre></li>");
+        }
+        if (uncaughtError) {
+          $("#results").append("<li class='test fail'>" +
+            "<h2>Errors rendering UI-Showcase</h2>" +
+            "<pre class='error'>" + uncaughtError + "\n" + uncaughtError.stack + "</pre>" +
+            "</li>");
+        }
       } else {
         $("#results").append("<div class='failures'><em>0</em></div>");
       }

browser/components/loop/ui/ui-showcase.jsx

@@ -421,8 +421,8 @@
     shapes: {
       "10x10": ["close", "close-active", "close-disabled", "dropdown",
         "dropdown-white", "dropdown-active", "dropdown-disabled", "edit",
-        "edit-active", "edit-disabled", "expand", "expand-active", "expand-disabled",
-        "minimize", "minimize-active", "minimize-disabled"
+        "edit-active", "edit-disabled", "edit-white", "expand", "expand-active",
+        "expand-disabled", "minimize", "minimize-active", "minimize-disabled"
       ],
       "14x14": ["audio", "audio-active", "audio-disabled", "facemute",
         "facemute-active", "facemute-disabled", "hangup", "hangup-active",
@@ -1282,6 +1282,15 @@
   });
 
   window.addEventListener("DOMContentLoaded", function() {
+    var uncaughtError;
+    var consoleWarn = console.warn;
+    var caughtWarnings = [];
+    console.warn = function() {
+      var args = Array.slice(arguments);
+      caughtWarnings.push(args);
+      consoleWarn.apply(console, args);
+    };
+
     try {
       React.renderComponent(<App />, document.getElementById("main"));
 
@@ -1304,12 +1313,23 @@
 
       // This simulates the mocha layout for errors which means we can run
       // this alongside our other unit tests but use the same harness.
-      if (uncaughtError) {
-        $("#results").append("<div class='failures'><em>1</em></div>");
-        $("#results").append("<li class='test fail'>" +
-          "<h2>Errors rendering UI-Showcase</h2>" +
-          "<pre class='error'>" + uncaughtError + "\n" + uncaughtError.stack + "</pre>" +
-          "</li>");
+      var expectedWarningsCount = 53;
+      var warningsMismatch = caughtWarnings.length !== expectedWarningsCount;
+      if (uncaughtError || warningsMismatch) {
+        $("#results").append("<div class='failures'><em>" +
+          (!!(uncaughtError && warningsMismatch) ? 2 : 1) + "</em></div>");
+        if (warningsMismatch) {
+          $("#results").append("<li class='test fail'>" +
+            "<h2>Unexpected number of warnings detected in UI-Showcase</h2>" +
+            "<pre class='error'>Got: " + caughtWarnings.length + "\n" +
+            "Expected: " + expectedWarningsCount + "</pre></li>");
+        }
+        if (uncaughtError) {
+          $("#results").append("<li class='test fail'>" +
+            "<h2>Errors rendering UI-Showcase</h2>" +
+            "<pre class='error'>" + uncaughtError + "\n" + uncaughtError.stack + "</pre>" +
+            "</li>");
+        }
       } else {
         $("#results").append("<div class='failures'><em>0</em></div>");
       }

mobile/android/base/gfx/LayerRenderer.java

@@ -17,6 +17,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Matrix;
@@ -147,7 +148,10 @@ public class LayerRenderer implements Tabs.OnTabsChangedListener {
         mView = view;
         setOverscrollColor(R.color.toolbar_grey);
 
-        Bitmap scrollbarImage = view.getScrollbarImage();
+        final BitmapFactory.Options bitmapOptions = new BitmapFactory.Options();
+        bitmapOptions.inScaled = false;
+        Bitmap scrollbarImage =
+                BitmapUtils.decodeResource(view.getContext(), R.drawable.scrollbar, bitmapOptions);
         IntSize size = new IntSize(scrollbarImage.getWidth(), scrollbarImage.getHeight());
         scrollbarImage = expandCanvasToPowerOfTwo(scrollbarImage, size);
 

mobile/android/base/gfx/LayerView.java

@@ -459,18 +459,6 @@ public class LayerView extends FrameLayout implements Tabs.OnTabsChangedListener
         return mGLController;
     }
 
-    private Bitmap getDrawable(String name) {
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inScaled = false;
-        Context context = getContext();
-        int resId = context.getResources().getIdentifier(name, "drawable", context.getPackageName());
-        return BitmapUtils.decodeResource(context, resId, options);
-    }
-
-    Bitmap getScrollbarImage() {
-        return getDrawable("scrollbar");
-    }
-
     /* When using a SurfaceView (mSurfaceView != null), resizing happens in two
      * phases. First, the LayerView changes size, then, often some frames later,
      * the SurfaceView changes size. Because of this, we need to split the

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

@@ -199,8 +199,8 @@
 <!ENTITY tab_queue_toast_message3 "Tab saved in &brandShortName;">
 <!ENTITY tab_queue_toast_action "Open now">
 <!ENTITY tab_queue_prompt_title "Opening multiple links?">
-<!ENTITY tab_queue_prompt_text3 "Save them until the next time you open &brandShortName;">
-<!ENTITY tab_queue_prompt_tip_text "you can change this later in Settings">
+<!ENTITY tab_queue_prompt_text4 "Save them until the next time you open &brandShortName;.">
+<!ENTITY tab_queue_prompt_tip_text2 "You can change this later in Settings">
 <!ENTITY tab_queue_prompt_positive_action_button "Enable">
 <!ENTITY tab_queue_prompt_negative_action_button "Not now">
 <!ENTITY tab_queue_notification_title "&brandShortName;">

mobile/android/base/resources/anim/progress_spinner.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/linear_interpolator">
-
-    <rotate android:duration="1200"
-            android:fromDegrees="0"
-            android:pivotX="50%"
-            android:pivotY="50%"
-            android:repeatCount="infinite"
-            android:toDegrees="360"/>
-
-</set>

mobile/android/base/resources/anim/shrink_fade_out.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <scale android:fromXScale="1.0"
-           android:toXScale="1.0"
-           android:fromYScale="1.0"
-           android:toYScale="0.3"
-           android:pivotX="0%"
-           android:pivotY="0%"
-           android:duration="150"/>
-
-    <alpha android:interpolator="@android:anim/accelerate_interpolator"
-           android:fromAlpha="1.0"
-           android:toAlpha="0.0"
-           android:duration="150"/>
-
-</set>

mobile/android/base/resources/color/primary_text_inverse.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_enabled="false" android:color="@color/text_color_primary_disable_only" />
-    <item android:color="@color/about_page_header_grey"/>
-
-</selector>

mobile/android/base/resources/color/secondary_text_inverse.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_enabled="false" android:color="@color/text_color_primary_disable_only" />
-    <item android:color="@color/text_color_secondary_inverse"/>
-
-</selector>

mobile/android/base/resources/color/tertiary_text_inverse.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_enabled="false" android:color="@color/text_color_primary_disable_only" />
-    <item android:color="@color/text_color_tertiary_inverse"/>
-
-</selector>