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

Commit fb034241 authored by Tony Huang's avatar Tony Huang
Browse files

Fix some failed tests 

1. In master branch, SortModel and SortDimension parcelable test
   failed due to cannot find its CREATOR, add "final" can solve.
2. testKeyboard_arrowsRootsList will failed due to drawer layout
   is not focusable, remove it.

Bug: 131735635
Bug: 131814303
Test: atest DocumentsUIGoogleTests
Change-Id: I3ca9cdad32dd33281f9fbb3b6414c9bb987fe4c8
parent 8828d1df

src/com/android/documentsui/DrawerController.java

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ public abstract class DrawerController implements DrawerListener { 
            mToggle = toggle;



            mLayout.setDrawerListener(this);

            mLayout.setFocusable(false);



            if (activityConfig.dragAndDropEnabled()) {

                View edge = layout.findViewById(R.id.drawer_edge);

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

+4 −3
Original line number Diff line number Diff line
@@ -16,12 +16,13 @@ 


package com.android.documentsui.sorting;



import androidx.annotation.IntDef;

import android.os.Parcel;

import android.os.Parcelable;

import androidx.annotation.StringRes;

import android.view.View;



import androidx.annotation.IntDef;

import androidx.annotation.StringRes;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -179,7 +180,7 @@ public class SortDimension implements Parcelable { 
        out.writeInt(mVisibility);

    }



    public static Parcelable.Creator<SortDimension> CREATOR =

    public static final Parcelable.Creator<SortDimension> CREATOR =

            new Parcelable.Creator<SortDimension>() {



        @Override

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

+6 −4
Original line number Diff line number Diff line
@@ -18,19 +18,20 @@ package com.android.documentsui.sorting; 


import static com.android.documentsui.base.SharedMinimal.DEBUG;



import androidx.annotation.IntDef;

import androidx.annotation.Nullable;

import android.content.ContentResolver;

import android.database.Cursor;

import android.os.Bundle;

import android.os.Parcel;

import android.os.Parcelable;

import android.provider.DocumentsContract.Document;

import androidx.annotation.VisibleForTesting;

import android.util.Log;

import android.util.SparseArray;

import android.view.View;



import androidx.annotation.IntDef;

import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;



import com.android.documentsui.R;

import com.android.documentsui.base.Lookup;

import com.android.documentsui.sorting.SortDimension.SortDirection;
@@ -420,7 +421,8 @@ public class SortModel implements Parcelable { 
        out.writeInt(getSortedDimensionId());

    }



    public static Parcelable.Creator<SortModel> CREATOR = new Parcelable.Creator<SortModel>() {

    public static final Parcelable.Creator<SortModel> CREATOR =

            new Parcelable.Creator<SortModel>() {



        @Override

        public SortModel createFromParcel(Parcel in) {