Merge "Disable rapid drawer tapping" into jb-ub-mail-ur9
diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index 674ac4c..2fa5303 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -171,15 +171,19 @@
* and we can replace the folder list fragment without concern.
*/
private void resetAndLoadDrawer() {
- if(mDrawerContainer.isDrawerVisible(mDrawerPullout)) {
+ if (mDrawerContainer.isDrawerVisible(mDrawerPullout)) {
mDrawerContainer.setDrawerListener(new DrawerLayout.SimpleDrawerListener() {
@Override
public void onDrawerClosed(View drawerView) {
loadFolderList();
+ // Remove listener and unlock drawer to avoid onDrawerClosed
+ // being called again and for user to freely drag after load
mDrawerContainer.setDrawerListener(null);
+ mDrawerContainer.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
}
});
- mDrawerContainer.closeDrawers();
+ // This will invoke closeDrawer as well to hide drawer to the left
+ mDrawerContainer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
} else {
loadFolderList();
}