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

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

Move sorting widgets to sorting package. 

Change-Id: I06b1b17d2d0f03e9f90e98fc6a842710b9bbb8a0
parent 98c8caf6

res/layout-sw720dp-land/column_headers.xml

+8 −8
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
            android:layout_weight="1"

            android:orientation="horizontal">



            <com.android.documentsui.dirlist.header.HeaderCell

            <com.android.documentsui.sorting.HeaderCell

                android:id="@android:id/title"

                android:layout_width="0dp"

                android:layout_height="match_parent"
@@ -65,9 +65,9 @@ 
                android:animateLayoutChanges="true">



                <include layout="@layout/shared_cell_content" />

            </com.android.documentsui.dirlist.header.HeaderCell>

            </com.android.documentsui.sorting.HeaderCell>



            <com.android.documentsui.dirlist.header.HeaderCell

            <com.android.documentsui.sorting.HeaderCell

                android:id="@android:id/summary"

                android:layout_width="0dp"

                android:layout_height="match_parent"
@@ -79,9 +79,9 @@ 
                android:animateLayoutChanges="true">



                <include layout="@layout/shared_cell_content" />

            </com.android.documentsui.dirlist.header.HeaderCell>

            </com.android.documentsui.sorting.HeaderCell>



            <com.android.documentsui.dirlist.header.HeaderCell

            <com.android.documentsui.sorting.HeaderCell

                android:id="@+id/size"

                android:layout_width="0dp"

                android:layout_height="match_parent"
@@ -93,9 +93,9 @@ 
                android:animateLayoutChanges="true">



                <include layout="@layout/shared_cell_content" />

            </com.android.documentsui.dirlist.header.HeaderCell>

            </com.android.documentsui.sorting.HeaderCell>



            <com.android.documentsui.dirlist.header.HeaderCell

            <com.android.documentsui.sorting.HeaderCell

                android:id="@+id/date"

                android:layout_width="0dp"

                android:layout_height="match_parent"
@@ -107,7 +107,7 @@ 
                android:animateLayoutChanges="true">



                <include layout="@layout/shared_cell_content" />

            </com.android.documentsui.dirlist.header.HeaderCell>

            </com.android.documentsui.sorting.HeaderCell>

        </LinearLayout>

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

src/com/android/documentsui/dirlist/DropdownSortWidgetController.java→src/com/android/documentsui/sorting/DropdownSortWidgetController.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.documentsui.dirlist;

package com.android.documentsui.sorting;



import android.annotation.StringRes;

import android.view.Gravity;

src/com/android/documentsui/dirlist/header/HeaderCell.java→src/com/android/documentsui/sorting/HeaderCell.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.documentsui.dirlist.header;

package com.android.documentsui.sorting;



import android.animation.AnimatorInflater;

import android.animation.LayoutTransition;

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

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ import com.android.documentsui.Metrics; 
import com.android.documentsui.R;

import com.android.documentsui.State;

import com.android.documentsui.State.ViewMode;

import com.android.documentsui.dirlist.DropdownSortWidgetController;

import com.android.documentsui.dirlist.header.TableHeaderController;



/**

 * A high level controller that manages sort widgets. This is useful when sort widgets can and will

src/com/android/documentsui/dirlist/header/TableHeaderController.java→src/com/android/documentsui/sorting/TableHeaderController.java

+1 −4
Original line number Diff line number Diff line
@@ -14,14 +14,11 @@ 
 * limitations under the License.

 */



package com.android.documentsui.dirlist.header;

package com.android.documentsui.sorting;



import android.view.View;



import com.android.documentsui.R;

import com.android.documentsui.sorting.SortController;

import com.android.documentsui.sorting.SortDimension;

import com.android.documentsui.sorting.SortModel;

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



import javax.annotation.Nullable;