diff options
| author | Jin Cao <jinyan@google.com> | 2014-11-02 20:51:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-02 20:51:40 +0000 |
| commit | e1d8e1935095374cd21f40d35fa67f1a3dfcf061 (patch) | |
| tree | c805215656c8879a267f08056df5d1a610567f06 /src | |
| parent | 63256af4c03f9920001004ac443793c51f7c0f38 (diff) | |
| parent | f771600660c21af988c09c3cff364edf51219cc3 (diff) | |
| download | android_packages_apps_UnifiedEmail-e1d8e1935095374cd21f40d35fa67f1a3dfcf061.tar.gz android_packages_apps_UnifiedEmail-e1d8e1935095374cd21f40d35fa67f1a3dfcf061.tar.bz2 android_packages_apps_UnifiedEmail-e1d8e1935095374cd21f40d35fa67f1a3dfcf061.zip | |
am f7716006: am 3f984419: am 5923a043: am 25d70e7d: am 1caa0f28: Merge "Navigate up if up is pressed for nested folders" into ub-gmail-ur14-dev
* commit 'f771600660c21af988c09c3cff364edf51219cc3':
Navigate up if up is pressed for nested folders
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/mail/ui/TwoPaneController.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java index 2af141a75..7a9605f3b 100644 --- a/src/com/android/mail/ui/TwoPaneController.java +++ b/src/com/android/mail/ui/TwoPaneController.java @@ -736,7 +736,14 @@ public final class TwoPaneController extends AbstractActivityController implemen if (isHidingConversationList()) { handleBackPress(); } else { - toggleDrawerState(); + final boolean isTopLevel = Folder.isRoot(mFolder); + + if (isTopLevel) { + // Show the drawer. + toggleDrawerState(); + } else { + navigateUpFolderHierarchy(); + } } return true; |