From 35820cfe963ce120a5876b8a123d5b1df13cbac5 Mon Sep 17 00:00:00 2001 From: Steve McKay Date: Tue, 3 Nov 2015 14:00:45 -0800 Subject: [PATCH] Handle SpacerItem on click correctly. Bug: 13319202 Change-Id: I22f556f512f55cc09eead462a4eb8cea99dc5e64 --- .../src/com/android/documentsui/RootsFragment.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java b/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java index d75b6fdf77bca..beff196509b2d 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java @@ -16,6 +16,8 @@ package com.android.documentsui; +import static com.android.documentsui.Shared.DEBUG; + import android.app.Fragment; import android.app.FragmentManager; import android.app.FragmentTransaction; @@ -30,6 +32,7 @@ import android.os.Bundle; import android.provider.Settings; import android.text.TextUtils; import android.text.format.Formatter; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -56,12 +59,13 @@ import java.util.Objects; */ public class RootsFragment extends Fragment { + private static final String TAG = "RootsFragment"; + private static final String EXTRA_INCLUDE_APPS = "includeApps"; + private ListView mList; private RootsAdapter mAdapter; - private LoaderCallbacks> mCallbacks; - private static final String EXTRA_INCLUDE_APPS = "includeApps"; public static void show(FragmentManager fm, Intent includeApps) { final Bundle args = new Bundle(); @@ -180,6 +184,8 @@ public class RootsFragment extends Fragment { } else if (item instanceof AppItem) { DocumentsActivity activity = DocumentsActivity.get(RootsFragment.this); activity.onAppPicked(((AppItem) item).info); + } else if (item instanceof SpacerItem) { + if (DEBUG) Log.d(TAG, "Ignoring click on spacer item."); } else { throw new IllegalStateException("Unknown root: " + item); }