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

Commit 243cf9c6 authored by Tony Huang's avatar Tony Huang
Browse files

Add sorting item on overflow menu 

Add sorting item on overflow on both option and action mode menu.

Bug: 116460328
Test: atest DocumentsUITests
Change-Id: I49a7c0994def4dfddc82066b50012c76ae8e2d52
parent c8ffc78c

res/menu/action_mode_menu.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,10 @@ 
        android:icon="@drawable/ic_menu_delete"

        android:icon="@drawable/ic_menu_delete"

        android:title="@string/menu_delete"

        android:title="@string/menu_delete"

        android:showAsAction="always" />

        android:showAsAction="always" />

    <item

        android:id="@+id/action_menu_sort"

        android:title="@string/menu_sort"

        android:showAsAction="never" />

    <item

    <item

        android:id="@+id/action_menu_select"

        android:id="@+id/action_menu_select"

        android:title="@string/menu_select"

        android:title="@string/menu_select"

res/menu/activity.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -62,6 +62,11 @@ 
            android:alphabeticShortcut="e"

            android:alphabeticShortcut="e"

            android:showAsAction="never"

            android:showAsAction="never"

            android:visible="false" />

            android:visible="false" />

        <item

            android:id="@+id/option_menu_sort"

            android:title="@string/menu_sort"

            android:showAsAction="never"

            android:visible="false" />

        <item

        <item

            android:id="@+id/option_menu_select_all"

            android:id="@+id/option_menu_select_all"

            android:title="@string/menu_select_all"

            android:title="@string/menu_select_all"

res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,8 @@ 
    <string name="menu_select_all">Select all</string>

    <string name="menu_select_all">Select all</string>

    <!-- Menu item title that selects documents in the current directory [CHAR LIMIT=28] -->

    <!-- Menu item title that selects documents in the current directory [CHAR LIMIT=28] -->

    <string name="menu_select">Select</string>

    <string name="menu_select">Select</string>

    <!-- Menu item title that sort documents in the current directory [CHAR LIMIT=28] -->

    <string name="menu_sort">Sort by...</string>

    <!-- Menu item title that copies the selected documents [CHAR LIMIT=28] -->

    <!-- Menu item title that copies the selected documents [CHAR LIMIT=28] -->

    <string name="menu_copy">Copy to\u2026</string>

    <string name="menu_copy">Copy to\u2026</string>

    <!-- Menu item title that moves the selected documents [CHAR LIMIT=28] -->

    <!-- Menu item title that moves the selected documents [CHAR LIMIT=28] -->

src/com/android/documentsui/AbstractActionHandler.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -63,6 +63,7 @@ import com.android.documentsui.roots.LoadFirstRootTask; 
import com.android.documentsui.roots.LoadRootTask;

import com.android.documentsui.roots.LoadRootTask;

import com.android.documentsui.roots.ProvidersAccess;

import com.android.documentsui.roots.ProvidersAccess;

import com.android.documentsui.sidebar.EjectRootTask;

import com.android.documentsui.sidebar.EjectRootTask;

import com.android.documentsui.sorting.SortListFragment;

import com.android.documentsui.ui.Snackbars;

import com.android.documentsui.ui.Snackbars;





import java.util.ArrayList;

import java.util.ArrayList;
@@ -307,6 +308,11 @@ public abstract class AbstractActionHandler<T extends Activity & CommonAddons> 
        CreateDirectoryFragment.show(mActivity.getFragmentManager());

        CreateDirectoryFragment.show(mActivity.getFragmentManager());

    }

    }





    @Override

    public void showSortDialog() {

        SortListFragment.show(mActivity.getFragmentManager(), mState.sortModel);

    }



    @Override

    @Override

    @Nullable

    @Nullable

    public DocumentInfo renameDocument(String name, DocumentInfo document) {

    public DocumentInfo renameDocument(String name, DocumentInfo document) {

src/com/android/documentsui/ActionHandler.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -158,6 +158,8 @@ public interface ActionHandler { 
    void setDebugMode(boolean enabled);

    void setDebugMode(boolean enabled);

    void showDebugMessage();

    void showDebugMessage();





    void showSortDialog();



    /**

    /**

     * Allow action handler to be initialized in a new scope.

     * Allow action handler to be initialized in a new scope.

     * @return this

     * @return this