From: Stephen Bird <sbird@cyngn.com>
Date: Wed, 8 Jul 2015 20:03:32 +0000 (-0700)
Subject: Easy Mode: Fix exit on easy mode screen
X-Git-Tag: android-x86-6.0-r1~77
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b4d6b6ec45f4f3310220816a9ea85ac41b3b5995;p=android-x86%2Fpackages-apps-CMFileManager.git

Easy Mode: Fix exit on easy mode screen

Change-Id: Iec39763194916c12c1947fb4f297e74c6dfa2f5f
---

diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index 99fa641..ca560c6 100755
--- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -1801,12 +1801,14 @@ public class NavigationActivity extends Activity
             mDrawerLayout.closeDrawer(Gravity.START);
             return;
         }
-        if (checkBackAction()) {
-            performHideEasyMode();
+
+        boolean upToParent = mHistory.size() > 0;
+
+        if (mNeedsEasyMode && !isEasyModeVisible() && !upToParent) {
+            performShowEasyMode();
             return;
         } else {
-            if (mNeedsEasyMode && !isEasyModeVisible()) {
-                performShowEasyMode();
+            if (checkBackAction()) {
                 return;
             }
         }