aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2012-12-05 23:15:39 +0100
committerJorge Ruesga <jorge@ruesga.com>2012-12-05 23:15:39 +0100
commitf10777b12a8b5ea44ebe80dfdfaff82634648aec (patch)
tree121b610d78532ce062b1b0e5e33240dfda33b753
parent63d1e03dc50dcd92cd669939ea5413a8819e2162 (diff)
downloadandroid_packages_apps_CMFileManager-f10777b12a8b5ea44ebe80dfdfaff82634648aec.tar.gz
android_packages_apps_CMFileManager-f10777b12a8b5ea44ebe80dfdfaff82634648aec.tar.bz2
android_packages_apps_CMFileManager-f10777b12a8b5ea44ebe80dfdfaff82634648aec.zip
Issue 6795: File Manager selected file actions vanish on navigation to parent directory
Issue: http://code.google.com/p/cyanogenmod/issues/detail?id=6795 The issue is relate to back navigation (nor to ahead navigation). In this case the history parcelable info data is recovery (which has a invalid selection data). On back navigation, replace the selection data parcelable info with the current selection of the navigation view. Added notifyDataSetChanged() when toogle visibility, needed to refresh the view and repaint the items. Change-Id: Ib281c6fbc33274f6e81cc6b588cde420d6ceb19f
-rw-r--r--src/com/cyanogenmod/filemanager/activities/NavigationActivity.java2
-rw-r--r--src/com/cyanogenmod/filemanager/adapters/FileSystemObjectAdapter.java1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index 77107dea..56b7ec90 100644
--- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -1218,6 +1218,8 @@ public class NavigationActivity extends Activity
(NavigationViewInfoParcelable)realHistory.getItem();
int viewId = info.getId();
NavigationView view = getNavigationView(viewId);
+ // Selected items must not be restored from on history navigation
+ info.setSelectedFiles(view.getSelectedFiles());
view.onRestoreState(info);
} else if (realHistory.getItem() instanceof SearchInfoParcelable) {
diff --git a/src/com/cyanogenmod/filemanager/adapters/FileSystemObjectAdapter.java b/src/com/cyanogenmod/filemanager/adapters/FileSystemObjectAdapter.java
index bc25c5cc..c0f5facb 100644
--- a/src/com/cyanogenmod/filemanager/adapters/FileSystemObjectAdapter.java
+++ b/src/com/cyanogenmod/filemanager/adapters/FileSystemObjectAdapter.java
@@ -457,6 +457,7 @@ public class FileSystemObjectAdapter
theme.getDrawable(
getContext(), "checkbox_deselected_drawable"); //$NON-NLS-1$
}
+ notifyDataSetChanged();
//Add or remove from the global selected items
FileSystemObject fso = getItem(i);