wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 877735 - Slide menu icon with other buttons in toolbar animation (r=mfinkle)

Browse Source
This commit is contained in:
Lucas Rocha 2013-05-30 19:47:44 +01:00
parent 940869fd2c
commit f9cd6b5dda
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mobile/android/base/BrowserToolbar.java
View File

@ -593,6 +593,7 @@ public class BrowserToolbar implements Tabs.OnTabsChangedListener,
if (mHasSoftMenuButton) {
ViewHelper.setTranslationX(mMenu, curveTranslation);
ViewHelper.setTranslationX(mMenuIcon, curveTranslation);
}
ViewHelper.setAlpha(mReader, 0);
@ -620,10 +621,14 @@ public class BrowserToolbar implements Tabs.OnTabsChangedListener,
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
@ -707,10 +712,14 @@ public class BrowserToolbar implements Tabs.OnTabsChangedListener,
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