Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3d97900a: am c1125ded: Merge "Disable ActionBar animations pending more involved fix" into mnc-dev

Browse Source 
* commit '3d97900aaa4b8d64ade58f118427dac2e08932f9':
  Disable ActionBar animations pending more involved fix
This commit is contained in:
Chet Haase
2015-05-08 16:37:51 +00:00
committed by Android Git Automerger
parent 7f29a802ab 3d97900aaa
commit 1ca7349184
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/widget/ActionMenuPresenter.java
View File

@@ -61,6 +61,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter
implements ActionProvider.SubUiVisibilityListener {
private static final String TAG = "ActionMenuPresenter";
private static final int ITEM_ANIMATION_DURATION = 150;
private static final boolean ACTIONBAR_ANIMATIONS_ENABLED = false;
private OverflowMenuButton mOverflowButton;
private boolean mReserveOverflow;
@@ -414,7 +415,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter
@Override
public void updateMenuView(boolean cleared) {
final ViewGroup menuViewParent = (ViewGroup) ((View) mMenuView).getParent();
if (menuViewParent != null) {
if (menuViewParent != null && ACTIONBAR_ANIMATIONS_ENABLED) {
setupItemAnimations();
}
super.updateMenuView(cleared);