aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2014-11-17 22:44:26 +0100
committerJorge Ruesga <jorge@ruesga.com>2014-11-17 22:44:26 +0100
commit62fb78c473cbe578ca24d05d0a636a148bb068e1 (patch)
tree6e8269b28e02f2ea46fb2fbfc55290a7fc85400a
parent4191e0d9e355c5373c5d662fb87e2e6d858d8fd0 (diff)
downloadandroid_packages_apps_CMFileManager-62fb78c473cbe578ca24d05d0a636a148bb068e1.tar.gz
android_packages_apps_CMFileManager-62fb78c473cbe578ca24d05d0a636a148bb068e1.tar.bz2
android_packages_apps_CMFileManager-62fb78c473cbe578ca24d05d0a636a148bb068e1.zip
cmfm: Fix clear history button visibility logic
Change-Id: I736a27d63363ce7d5ddbc871a6a5d74a40794113 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
-rw-r--r--src/com/cyanogenmod/filemanager/activities/NavigationActivity.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index 72149e70..3d22c591 100644
--- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -873,7 +873,7 @@ public class NavigationActivity extends Activity
mDrawerHistory.addView(view, 0);
// Show clear button if history tab is selected
- mClearHistory.setVisibility(mHistoryTab.getVisibility());
+ mClearHistory.setVisibility(mHistoryTab.isSelected() ? View.VISIBLE : View.GONE);
}
/**
@@ -1999,6 +1999,8 @@ public class NavigationActivity extends Activity
}
//Navigate
+ boolean clearHistory = mHistoryTab.isSelected() && mHistory.size() > 0;
+ mClearHistory.setVisibility(clearHistory ? View.VISIBLE : View.GONE);
return true;
} catch (Throwable ex) {
@@ -2053,13 +2055,13 @@ public class NavigationActivity extends Activity
}
}
- //Extract a history from the
+ //Navigate to history
if (this.mHistory.size() > 0) {
- //Navigate to history
return navigateToHistory(this.mHistory.get(this.mHistory.size() - 1));
}
//Nothing to apply
+ mClearHistory.setVisibility(View.GONE);
return false;
}