Merge remote-tracking branch 'upstream/jellybean' into ics

CyanogenMod · Dec 12, 2012 · d7460f8 · d7460f8
2 parents a0ec2b4 + 64aa1f4
commit d7460f8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -1220,6 +1220,8 @@ public boolean navigateToHistory(History history) {
                         (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
@@ -457,6 +457,7 @@ private void doSelectDeselectAllVisibleItems(boolean select) {
                             theme.getDrawable(
                                     getContext(), "checkbox_deselected_drawable"); //$NON-NLS-1$
                 }
+                notifyDataSetChanged();
 
                 //Add or remove from the global selected items
                 FileSystemObject fso = getItem(i);

diff --git a/src/com/cyanogenmod/filemanager/util/ExceptionUtil.java b/src/com/cyanogenmod/filemanager/util/ExceptionUtil.java
@@ -206,7 +206,7 @@ public void run() {
         }
 
         //Audit the exception
-        Log.e(context.getClass().getSimpleName(), "Error dectected", ex); //$NON-NLS-1$
+        Log.e(context.getClass().getSimpleName(), "Error detected", ex); //$NON-NLS-1$
 
         //Build the alert
         final int fMsgResId = msgResId;