Bug 1001243: Disable tabs button when in editing mode. r=bnicholson

This commit is contained in:
Michael Comella 2014-05-12 15:19:16 -07:00
parent 38fadc8622
commit ba2aef42e7

View File

@ -1004,11 +1004,17 @@ public class BrowserToolbar extends ThemedRelativeLayout
ViewHelper.setTranslationX(urlBarTranslatingEdge, entryTranslation);
}
// Prevent taps through the editing mode cancel button (bug 1001243).
tabsButton.setEnabled(false);
ViewHelper.setTranslationX(tabsButton, curveTranslation);
ViewHelper.setTranslationX(tabsCounter, curveTranslation);
ViewHelper.setTranslationX(actionItemBar, curveTranslation);
if (hasSoftMenuButton) {
// Prevent tabs through the editing mode cancel button (bug 1001243).
menuButton.setEnabled(false);
ViewHelper.setTranslationX(menuButton, curveTranslation);
ViewHelper.setTranslationX(menuIcon, curveTranslation);
}
@ -1130,11 +1136,15 @@ public class BrowserToolbar extends ThemedRelativeLayout
}
}
tabsButton.setEnabled(true);
ViewHelper.setTranslationX(tabsButton, 0);
ViewHelper.setTranslationX(tabsCounter, 0);
ViewHelper.setTranslationX(actionItemBar, 0);
if (hasSoftMenuButton) {
menuButton.setEnabled(true);
ViewHelper.setTranslationX(menuButton, 0);
ViewHelper.setTranslationX(menuIcon, 0);
}