Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2c9d017 authored by jruesga's avatar jruesga
Browse files

New global action "Delete Selection"

parent a3c1736c

res/menu/actions.xml

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ 
      android:id="@+id/mnu_actions_move_selection"

      android:showAsAction="ifRoom"

      android:title="@string/actions_menu_move_selection"/>

    <item

      android:id="@+id/mnu_actions_delete_selection"

      android:showAsAction="ifRoom"

      android:title="@string/actions_menu_delete_selection"/>

    <item

      android:id="@+id/mnu_actions_add_to_bookmarks_current_folder"

      android:showAsAction="ifRoom"

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -428,6 +428,8 @@ 
  <string name="actions_menu_paste_selection">Paste selection</string>

  <!-- Actions Dialog * Menu * Move selection -->

  <string name="actions_menu_move_selection">Move selection</string>

  <!-- Actions Dialog * Menu * Delete selection -->

  <string name="actions_menu_delete_selection">Delete selection</string>

  <!-- Actions Dialog * Menu * Add to bookmarks the current folder -->

  <string name="actions_menu_add_to_bookmarks_current_folder">Add to bookmarks</string>

  <!-- Actions Dialog * Menu * Open -->

src/com/cyanogenmod/explorer/ui/dialogs/ActionsDialog.java

+15 −0
Original line number Diff line number Diff line
@@ -227,6 +227,20 @@ public class ActionsDialog implements OnItemClickListener, OnItemLongClickListen 
                ActionsPolicy.sendFileSystemObject(this.mContext, this.mFso);

                break;

                



            // Delete selection

            case R.id.mnu_actions_delete_selection:

                if (this.mOnSelectionListener != null) {

                    List<FileSystemObject> selection =

                            this.mOnSelectionListener.onRequestSelectedFiles();

                    ActionsPolicy.removeFileSystemObjects(

                            this.mContext,

                            selection,

                            this.mOnSelectionListener,

                            this.mOnRequestRefreshListener);

                }

                break;



            //- Create copy

            case R.id.mnu_actions_create_copy:

                // Create a copy of the fso
@@ -436,6 +450,7 @@ public class ActionsDialog implements OnItemClickListener, OnItemLongClickListen 
                // Remove paste/move actions

                menu.removeItem(R.id.mnu_actions_paste_selection);

                menu.removeItem(R.id.mnu_actions_move_selection);

                menu.removeItem(R.id.mnu_actions_delete_selection);

            }

        }

    }

src/com/cyanogenmod/explorer/ui/policy/ActionsPolicy.java

+8 −3
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ public final class ActionsPolicy { 
     * @see BackgroundCallable

     */

    private static class BackgroundAsyncTask

            extends AsyncTask<Object, Void, Throwable> {

            extends AsyncTask<Object, Spanned, Throwable> {



        private final Context mCtx;

        private final BackgroundCallable mCallable;
@@ -196,12 +196,17 @@ public final class ActionsPolicy { 
            }

        }



        @Override

        protected void onProgressUpdate(Spanned... values) {

            this.mDialog.setProgress(values[0]);

        }



        /**

         * @hide

         */

        void onRequestProgress() {

            Spanned progress = this.mCallable.requestProgress();

            this.mDialog.setProgress(progress);

            Spanned mProgress = this.mCallable.requestProgress();

            publishProgress(mProgress);

        }

    }