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

Commit 639938f3 authored by Steve McKay's avatar Steve McKay Committed by Android (Google) Code Review
Browse files

Merge "Handle SpacerItem on click correctly."

parents a93d871e 35820cfe
Loading
Loading
Loading
Loading
+8 −2
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@


package com.android.documentsui;
package com.android.documentsui;


import static com.android.documentsui.Shared.DEBUG;

import android.app.Fragment;
import android.app.Fragment;
import android.app.FragmentManager;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.app.FragmentTransaction;
@@ -30,6 +32,7 @@ import android.os.Bundle;
import android.provider.Settings;
import android.provider.Settings;
import android.text.TextUtils;
import android.text.TextUtils;
import android.text.format.Formatter;
import android.text.format.Formatter;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup;
@@ -56,12 +59,13 @@ import java.util.Objects;
 */
 */
public class RootsFragment extends Fragment {
public class RootsFragment extends Fragment {


    private static final String TAG = "RootsFragment";
    private static final String EXTRA_INCLUDE_APPS = "includeApps";

    private ListView mList;
    private ListView mList;
    private RootsAdapter mAdapter;
    private RootsAdapter mAdapter;

    private LoaderCallbacks<Collection<RootInfo>> mCallbacks;
    private LoaderCallbacks<Collection<RootInfo>> mCallbacks;


    private static final String EXTRA_INCLUDE_APPS = "includeApps";


    public static void show(FragmentManager fm, Intent includeApps) {
    public static void show(FragmentManager fm, Intent includeApps) {
        final Bundle args = new Bundle();
        final Bundle args = new Bundle();
@@ -180,6 +184,8 @@ public class RootsFragment extends Fragment {
            } else if (item instanceof AppItem) {
            } else if (item instanceof AppItem) {
                DocumentsActivity activity = DocumentsActivity.get(RootsFragment.this);
                DocumentsActivity activity = DocumentsActivity.get(RootsFragment.this);
                activity.onAppPicked(((AppItem) item).info);
                activity.onAppPicked(((AppItem) item).info);
            } else if (item instanceof SpacerItem) {
                if (DEBUG) Log.d(TAG, "Ignoring click on spacer item.");
            } else {
            } else {
                throw new IllegalStateException("Unknown root: " + item);
                throw new IllegalStateException("Unknown root: " + item);
            }
            }