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

Commit f830017b authored by Steve McKay's avatar Steve McKay
Browse files

Show more menu items on larger devices.

Bug: 27036292, 27406771
Change-Id: I1ceee3c69fbda33a6c51c0ff4f28e52911c1ca7d
parent e0dc3f29
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@
        android:id="@+id/menu_sort"
        android:title="@string/menu_sort"
        android:icon="@drawable/ic_menu_sortby"
        android:showAsAction="never">
        android:showAsAction="ifRoom">
        <menu>
            <item
                android:id="@+id/menu_sort_name"
+3 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public abstract class BaseActivity extends Activity
        final MenuItem fileSize = menu.findItem(R.id.menu_file_size);

        // Search uses backend ranking; no sorting, recents doesn't support sort.
        sort.setVisible(!inRecents && !mSearchManager.isSearching());
        sort.setEnabled(!inRecents && !mSearchManager.isSearching());
        sortSize.setVisible(mState.showSize); // Only sort by size when file sizes are visible
        fileSize.setVisible(!mState.forceSize);

@@ -244,6 +244,7 @@ public abstract class BaseActivity extends Activity
                return true;

            case R.id.menu_search:
                // SearchViewManager listens for this directly.
                return false;

            case R.id.menu_sort_name:
@@ -366,6 +367,7 @@ public abstract class BaseActivity extends Activity
        assert(canSearchRoot());

        reloadSearch(query);
        invalidateOptionsMenu();
    }

    private void reloadSearch(String query) {