From 2ef8a630f9861d26f240c2c7669692d11686026a Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Mon, 11 Nov 2013 18:33:45 +0000
Subject: [PATCH] Bug 935628 - Animate toolbar with translation instead of
 scroll (r=sriram)

---
 mobile/android/base/BrowserApp.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index f04f880820f8..227100fb071e 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -6,6 +6,7 @@
 package org.mozilla.gecko;
 
 import org.mozilla.gecko.animation.PropertyAnimator;
+import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.db.BrowserContract.Combined;
 import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.favicons.Favicons;
@@ -660,7 +661,7 @@ abstract public class BrowserApp extends GeckoApp
             }
             mHomePagerContainer.setPadding(0, 0, 0, 0);
             if (mBrowserToolbar != null) {
-                mBrowserToolbar.scrollTo(0, 0);
+                ViewHelper.setTranslationY(mBrowserToolbar, 0);
             }
         }
 
@@ -918,7 +919,7 @@ abstract public class BrowserApp extends GeckoApp
         final int marginTop = Math.round(aMetrics.marginTop);
         ThreadUtils.postToUiThread(new Runnable() {
             public void run() {
-                toolbarLayout.scrollTo(0, toolbarLayout.getHeight() - marginTop);
+                ViewHelper.setTranslationY(toolbarLayout, marginTop - toolbarLayout.getHeight());
             }
         });