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

Commit 020f01ce authored by Colin Cross's avatar Colin Cross
Browse files

Revert "Remove @SortDimensionId" 

Revert submission 25032702-DocumentsUI-lib

Reason for revert: broke document browsing

Reverted changes: /q/submissionid:25032702-DocumentsUI-lib

Bug: 307873144
Bug: 307882692
Change-Id: Ie0eefdf383fa5cb5339bc5b67608cb3c42057788
parent 03875210

src/com/android/documentsui/sorting/SortListFragment.java

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import androidx.fragment.app.FragmentManager; 


import com.android.documentsui.R;

import com.android.documentsui.sorting.SortDimension.SortDirection;

import com.android.documentsui.sorting.SortModel.SortDimensionId;



import com.google.android.material.bottomsheet.BottomSheetBehavior;

import com.google.android.material.bottomsheet.BottomSheetDialog;
@@ -169,7 +170,7 @@ public class SortListFragment extends DialogFragment { 


    private static class SortItem {



        final int id;

        @SortDimensionId final int id;

        @SortDirection final int direction;

        @StringRes final int labelId;
@@ -179,7 +180,7 @@ public class SortListFragment extends DialogFragment { 
            labelId = dimension.getLabelId();

        }



        SortItem(int id, @SortDirection int direction, @StringRes int labelId) {

        SortItem(@SortDimensionId int id, @SortDirection int direction, @StringRes int labelId) {

            this.id = id;

            this.direction = direction;

            this.labelId = labelId;

src/com/android/documentsui/sorting/SortModel.java

+10 −0
Original line number Diff line number Diff line
@@ -47,6 +47,16 @@ import java.util.function.Consumer; 
 * Sort model that contains all columns and their sorting state.

 */

public class SortModel implements Parcelable {

    @IntDef({

            SORT_DIMENSION_ID_UNKNOWN,

            SORT_DIMENSION_ID_TITLE,

            SORT_DIMENSION_ID_SUMMARY,

            SORT_DIMENSION_ID_SIZE,

            SORT_DIMENSION_ID_FILE_TYPE,

            SORT_DIMENSION_ID_DATE

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface SortDimensionId {}

    public static final int SORT_DIMENSION_ID_UNKNOWN = 0;

    public static final int SORT_DIMENSION_ID_TITLE = android.R.id.title;

    public static final int SORT_DIMENSION_ID_SUMMARY = android.R.id.summary;

src/com/android/documentsui/sorting/SortingCursorWrapper.java

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.provider.DocumentsContract.Document; 


import com.android.documentsui.base.Lookup;

import com.android.documentsui.base.Shared;

import com.android.documentsui.sorting.SortModel.SortDimensionId;



/**

 * Cursor wrapper that presents a sorted view of the underlying cursor. Handles
@@ -48,7 +49,7 @@ class SortingCursorWrapper extends AbstractCursor { 
        long[] longValues = null;

        String[] ids = new String[count];



        final int id = dimension.getId();

        final @SortDimensionId int id = dimension.getId();

        switch (id) {

            case SortModel.SORT_DIMENSION_ID_TITLE:

            case SortModel.SORT_DIMENSION_ID_FILE_TYPE:

src/com/android/documentsui/sorting/TableHeaderController.java

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.documentsui.sorting; 
import android.view.View;



import com.android.documentsui.R;

import com.android.documentsui.sorting.SortModel.SortDimensionId;



import javax.annotation.Nullable;
@@ -77,7 +78,7 @@ public final class TableHeaderController implements SortController.WidgetControl 
        mModel.removeListener(mModelListener);

    }



    private void bindCell(HeaderCell cell, int id) {

    private void bindCell(HeaderCell cell, @SortDimensionId int id) {

        assert(cell != null);

        SortDimension dimension = mModel.getDimensionById(id);

tests/common/com/android/documentsui/bots/SortBot.java

+3 −2
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.documentsui.sorting.SortDimension; 
import com.android.documentsui.sorting.SortDimension.SortDirection;

import com.android.documentsui.sorting.SortListFragment;

import com.android.documentsui.sorting.SortModel;

import com.android.documentsui.sorting.SortModel.SortDimensionId;



import org.hamcrest.Matcher;
@@ -66,7 +67,7 @@ public class SortBot extends Bots.BaseBot { 
        mUiBot = uiBot;

    }



    public void sortBy(int id, @SortDirection int direction) {

    public void sortBy(@SortDimensionId int id, @SortDirection int direction) {

        assert(direction != SortDimension.SORT_DIRECTION_NONE);



        final @StringRes int labelId = mSortModel.getDimensionById(id).getLabelId();
@@ -101,7 +102,7 @@ public class SortBot extends Bots.BaseBot { 
        assertTrue(Matchers.present(mColumnBot.MATCHER));

    }



    private boolean sortByMenu(int id, @SortDirection int direction) {

    private boolean sortByMenu(@SortDimensionId int id, @SortDirection int direction) {

        assert(direction != SortDimension.SORT_DIRECTION_NONE);



        clickMenuSort();