diff options
| author | Jin Cao <jinyan@google.com> | 2014-10-17 15:06:11 -0700 |
|---|---|---|
| committer | Jin Cao <jinyan@google.com> | 2014-10-17 15:06:11 -0700 |
| commit | 100edc57f77f392cca0a99b5f7f445440cde2303 (patch) | |
| tree | aab4ed2b48965e9c89001c254223efb3cd93569c /src | |
| parent | 17553ce2afdf3f8be5e53a639ac8f2593e388fec (diff) | |
| download | android_packages_apps_UnifiedEmail-100edc57f77f392cca0a99b5f7f445440cde2303.tar.gz android_packages_apps_UnifiedEmail-100edc57f77f392cca0a99b5f7f445440cde2303.tar.bz2 android_packages_apps_UnifiedEmail-100edc57f77f392cca0a99b5f7f445440cde2303.zip | |
Navigate up if up is pressed for nested folders
b/18022259
Change-Id: Ia93e1af3684dd11362bc2608691375f351ccba3d
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; |