mozilla-central: changeset 143434:ce8381f138ccc611d0ce17b655bf6fc6edc68e1e

author	Sriram Ramasubramanian <sriram@mozilla.com>
	Tue, 23 Jul 2013 15:21:00 -0700
changeset 143434	ce8381f138ccc611d0ce17b655bf6fc6edc68e1e
parent 143433	bd7116ff808e123eddcc89a0946d88ebca09ce0a
child 143435	b46dc80ff462228a5ee7cb15bb8dc912cbcde4d8
push id	25130
push user	lrocha@mozilla.com
push date	Wed, 21 Aug 2013 09:41:27 +0000
treeherder	mozilla-central@b2486721572e [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	lucasr
bugs	897126
milestone	25.0a1
first release with	nightly linux32 b2486721572e / 26.0a1 / 20130821050136 / files nightly linux64 b2486721572e / 26.0a1 / 20130821050136 / files nightly mac b2486721572e / 26.0a1 / 20130821050136 / files nightly win32 b2486721572e / 26.0a1 / 20130821050136 / files nightly win64 b2486721572e / 26.0a1 / 20130821050136 / files
last release without	nightly linux32 2268ff80683a / 25.0a1 / 20130722030226 / files nightly linux64 2268ff80683a / 25.0a1 / 20130722030226 / files nightly mac 2268ff80683a / 25.0a1 / 20130722030226 / files nightly win32 2268ff80683a / 25.0a1 / 20130722030226 / files nightly win64 2268ff80683a / 25.0a1 / 20130722030226 / files

--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -1262,21 +1262,26 @@ public class BrowserToolbar extends Geck
                                curveTranslation);
         contentAnimator.attach(mTabsCounter,
                                PropertyAnimator.Property.TRANSLATION_X,
                                curveTranslation);
         contentAnimator.attach(mActionItemBar,
                                PropertyAnimator.Property.TRANSLATION_X,
                                curveTranslation);
 
-        if (mHasSoftMenuButton)
+        if (mHasSoftMenuButton) {
             contentAnimator.attach(mMenu,
                                    PropertyAnimator.Property.TRANSLATION_X,
                                    curveTranslation);
 
+            contentAnimator.attach(mMenuIcon,
+                                   PropertyAnimator.Property.TRANSLATION_X,
+                                   curveTranslation);
+        }
+
         contentAnimator.setPropertyAnimationListener(new PropertyAnimator.PropertyAnimationListener() {
             @Override
             public void onPropertyAnimationStart() {
             }
 
             @Override
             public void onPropertyAnimationEnd() {
                 showUrlEditContainer();
@@ -1340,21 +1345,26 @@ public class BrowserToolbar extends Geck
                                0);
         contentAnimator.attach(mTabsCounter,
                                PropertyAnimator.Property.TRANSLATION_X,
                                0);
         contentAnimator.attach(mActionItemBar,
                                PropertyAnimator.Property.TRANSLATION_X,
                                0);
 
-        if (mHasSoftMenuButton)
+        if (mHasSoftMenuButton) {
             contentAnimator.attach(mMenu,
                                    PropertyAnimator.Property.TRANSLATION_X,
                                    0);
 
+            contentAnimator.attach(mMenuIcon,
+                                   PropertyAnimator.Property.TRANSLATION_X,
+                                   0);
+        }
+
         contentAnimator.setPropertyAnimationListener(new PropertyAnimator.PropertyAnimationListener() {
             @Override
             public void onPropertyAnimationStart() {
             }
 
             @Override
             public void onPropertyAnimationEnd() {
                 // Turn off selected state on the entry