am caca4062: am ae71dbbf: am e994ec26: am e9c786bb: Merge "Don\'t hide FAB when drawer is open" into ub-gmail-ur14-dev
* commit 'caca40626b71caf941dc9570ef5be68187014503':
Don't hide FAB when drawer is open
diff --git a/src/com/android/mail/ui/TwoPaneLayout.java b/src/com/android/mail/ui/TwoPaneLayout.java
index b7c7570..6cb674f 100644
--- a/src/com/android/mail/ui/TwoPaneLayout.java
+++ b/src/com/android/mail/ui/TwoPaneLayout.java
@@ -112,7 +112,6 @@
private final List<Runnable> mTransitionCompleteJobs = Lists.newArrayList();
private final PaneAnimationListener mPaneAnimationListener = new PaneAnimationListener();
- private View mComposeButton;
public static final int MISCELLANEOUS_VIEW_ID = R.id.miscellaneous_pane;
@@ -203,7 +202,6 @@
mListView = findViewById(R.id.conversation_list_pane);
mConversationView = findViewById(R.id.conversation_pane);
mMiscellaneousView = findViewById(MISCELLANEOUS_VIEW_ID);
- mComposeButton = findViewById(R.id.compose_button);
// all panes start GONE in initial UNKNOWN mode to avoid drawing misplaced panes
mCurrentMode = ViewMode.UNKNOWN;
@@ -366,7 +364,6 @@
final ViewPropertyAnimator listAnimation = mListView.animate()
.x(listX)
.setListener(mPaneAnimationListener);
- mComposeButton.animate().alpha(isDrawerOpen() ? 0f : 1f);
// If we're running K+, we can use the update listener to transition the list's left shadow
// and set different update listeners based on rtl to avoid doing a check on every frame
@@ -374,8 +371,7 @@
listAnimation.setUpdateListener(mListViewAnimationListener);
}
- configureAnimations(mConversationView, mFoldersView, mListView, mMiscellaneousView,
- mComposeButton);
+ configureAnimations(mConversationView, mFoldersView, mListView, mMiscellaneousView);
}
private void configureAnimations(View... views) {