aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorherriojr <jherriott@cyngn.com>2015-07-27 12:07:09 -0700
committerJon Herriott <jherriott@cyngn.com>2015-07-27 14:12:12 -0700
commit4e7904e32bebca0f2520076f19d40355d5308fe9 (patch)
treeae10db08ab73af78da5b4c462df0ceb14a72b468
parentff95c1c0fbae93f70e81c7b27d43d1d534fe0e09 (diff)
downloadandroid_packages_apps_CMFileManager-4e7904e32bebca0f2520076f19d40355d5308fe9.tar.gz
android_packages_apps_CMFileManager-4e7904e32bebca0f2520076f19d40355d5308fe9.tar.bz2
android_packages_apps_CMFileManager-4e7904e32bebca0f2520076f19d40355d5308fe9.zip
Fix Secure SD Card Entry to open folder.
Whenever the secure folder was opened from the drawer, it would prompt for a password and then go to the root folder again. This was caused by the logic in onResume() which is all meant for when entering another activity and then coming back into this activity. This should really be the job on onStart() as onResume() also handles dialogs. Change-Id: I45e0e44e3e8f9031b0685628a3f24c02725e24e1 Ticket: QRDL-946 (cherry picked from commit 9426b243dd41dea57718efa922e9c5f345338472)
-rw-r--r--src/com/cyanogenmod/filemanager/activities/NavigationActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index 04a6c2de..b30317b5 100644
--- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -624,8 +624,8 @@ public class NavigationActivity extends Activity
}
@Override
- protected void onResume() {
- super.onResume();
+ protected void onStart() {
+ super.onStart();
if (mSearchView.getVisibility() == View.VISIBLE) {
closeSearch();