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

Commit aa923c58 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6746982 from 2dd8b1cc to sc-release 

Change-Id: I5250d0953737a45cdab97f5fd08e0c70ba41b8df
parents 37459503 2dd8b1cc

res/layout/drawer_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ 
                    android:layout_width="match_parent"

                    android:layout_height="match_parent" />



                <!-- Drawer edge is a dummy view used to capture hovering event

                     on view edge to open the drawer. (b/28345294) -->

                <!-- Drawer edge is a placeholder view used to capture hovering

                     event on view edge to open the drawer. (b/28345294) -->

                <View

                    android:id="@+id/drawer_edge"

                    android:background="@android:color/transparent"

src/com/android/documentsui/AbstractActionHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA 
        public void onRootLoaded(@Nullable RootInfo root) {

            if (root == null) {

                // There is no such root in the other profile. Maybe the provider is missing on

                // the other profile. Create a dummy root and open it to show error message.

                // the other profile. Create a placeholder root and open it to show error message.

                root = RootInfo.copyRootInfo(mOriginalRoot);

                root.userId = mSelectedUserId;

            }

src/com/android/documentsui/BaseActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ public abstract class BaseActivity 
                getMainLooper().getQueue().addIdleHandler(new IdleHandler() {

                    @Override

                    public boolean queueIdle() {

                        // If startup benchmark is requested by a whitelisted testing package, then

                        // If startup benchmark is requested by an allowedlist testing package, then

                        // close the activity once idle, and notify the testing activity.

                        if (getIntent().getBooleanExtra(EXTRA_BENCHMARK, false) &&

                                BENCHMARK_TESTING_PACKAGE.equals(getCallingPackage())) {

src/com/android/documentsui/DocsSelectionHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ public final class DocsSelectionHelper extends SelectionTracker<String> { 


    private final DelegateFactory mFactory;



    // initialize to a dummy object incase we get some input

    // initialize to a stub object incase we get some input

    // event drive calls before we're properly initialized.

    // See: b/69306667.

    private SelectionTracker<String> mDelegate = new DummySelectionTracker<>();

    private SelectionTracker<String> mDelegate = new StubSelectionTracker<>();



    @VisibleForTesting

    DocsSelectionHelper(DelegateFactory factory) {

src/com/android/documentsui/DrawerController.java

+5 −5
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public abstract class DrawerController implements DrawerListener { 
        DrawerLayout layout = (DrawerLayout) activity.findViewById(R.id.drawer_layout);



        if (layout == null) {

            return new DummyDrawerController();

            return new StubDrawerController();

        }



        View drawer = activity.findViewById(R.id.drawer_roots);
@@ -76,8 +76,8 @@ public abstract class DrawerController implements DrawerListener { 
    /**

     * Returns a controller suitable for {@code Layout}.

     */

    static DrawerController createDummy() {

        return new DummyDrawerController();

    static DrawerController createStub() {

        return new StubDrawerController();

    }



    private static int calculateDrawerWidth(Activity activity) {
@@ -235,9 +235,9 @@ public abstract class DrawerController implements DrawerListener { 
    }



    /*

     * Dummy controller useful with clients that don't host a real drawer.

     * Stub controller useful with clients that don't host a real drawer.

     */

    private static final class DummyDrawerController extends DrawerController {

    private static final class StubDrawerController extends DrawerController {



        @Override

        public void setOpen(boolean open) {}