From 3bbb0cb62f8c8b339e6a12cf85d3bf7b76e8808b Mon Sep 17 00:00:00 2001 From: Steve McKay Date: Wed, 12 Jul 2017 18:46:09 -0700 Subject: Improve debug info. Add generic section title support to TableView. Add debug section title. Use sentence case for debug labels. Add more debug values (like weblinkable!) Minor padding layout tweaks. Move Julian's sweet row update logic into base class, use that from Debug (solving a bug). - exclude "web_linkable" support, since it wasn't landed in arc-apps. Bug: 63635841, 63638300 Test: Build and view the goodness. Change-Id: I8f66b4f75b886b366b4eeff65afe2ac104df45d1 (cherry picked from commit f433d20a7759775dfc848fdd50da2a3f01219a54) --- AndroidManifest.xml | 2 +- res/layout/document_inspector_fragment.xml | 6 +- res/layout/inspector_action_view.xml | 31 ++++---- res/layout/inspector_section_title.xml | 29 +++++++ res/layout/table_key_value_row.xml | 3 +- res/values/colors.xml | 2 +- res/values/strings.xml | 4 + src/com/android/documentsui/base/DocumentInfo.java | 8 ++ .../android/documentsui/files/ActionHandler.java | 6 +- .../android/documentsui/inspector/DebugView.java | 31 +++++--- .../android/documentsui/inspector/DetailsView.java | 42 ++++------- .../inspector/DocumentInspectorActivity.java | 69 ----------------- .../inspector/DocumentInspectorFragment.java | 88 ---------------------- .../documentsui/inspector/InspectorActivity.java | 67 ++++++++++++++++ .../documentsui/inspector/InspectorFragment.java | 88 ++++++++++++++++++++++ .../android/documentsui/inspector/TableView.java | 42 +++++++++++ .../documentsui/inspector/actions/Action.java | 1 + .../documentsui/inspector/actions/ActionView.java | 3 +- .../inspector/actions/ClearDefaultAppAction.java | 5 +- .../inspector/actions/ShowInProviderAction.java | 3 +- .../android/documentsui/FilesActivityUiTest.java | 4 +- .../com/android/documentsui/InspectorUiTest.java | 6 +- 22 files changed, 309 insertions(+), 231 deletions(-) create mode 100644 res/layout/inspector_section_title.xml delete mode 100644 src/com/android/documentsui/inspector/DocumentInspectorActivity.java delete mode 100644 src/com/android/documentsui/inspector/DocumentInspectorFragment.java create mode 100644 src/com/android/documentsui/inspector/InspectorActivity.java create mode 100644 src/com/android/documentsui/inspector/InspectorFragment.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 04680a09c..9f0ad3a7e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -57,7 +57,7 @@ diff --git a/res/layout/document_inspector_fragment.xml b/res/layout/document_inspector_fragment.xml index 82a2dabd4..5edb5e081 100644 --- a/res/layout/document_inspector_fragment.xml +++ b/res/layout/document_inspector_fragment.xml @@ -22,11 +22,13 @@ + android:layout_height="match_parent" + android:paddingBottom="5dp"> - \ No newline at end of file + diff --git a/res/layout/inspector_action_view.xml b/res/layout/inspector_action_view.xml index 0d08cbf0e..91418ae1c 100644 --- a/res/layout/inspector_action_view.xml +++ b/res/layout/inspector_action_view.xml @@ -14,36 +14,33 @@ limitations under the License. --> - + + android:layout_height="wrap_content" /> @@ -54,5 +51,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:background="@null"/> + - \ No newline at end of file + + diff --git a/res/layout/inspector_section_title.xml b/res/layout/inspector_section_title.xml new file mode 100644 index 000000000..2804811da --- /dev/null +++ b/res/layout/inspector_section_title.xml @@ -0,0 +1,29 @@ + + + + + diff --git a/res/layout/table_key_value_row.xml b/res/layout/table_key_value_row.xml index ff45cc13d..2bc8cf687 100644 --- a/res/layout/table_key_value_row.xml +++ b/res/layout/table_key_value_row.xml @@ -19,7 +19,8 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingTop="20dp" + android:paddingTop="10dp" + android:paddingBottom="10dp" android:paddingLeft="16dp"> #ffbebebe #fff0f0f0 - #757575 #ff939393 + #ff939393 diff --git a/res/values/strings.xml b/res/values/strings.xml index 482c29373..c45d32265 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -386,4 +386,8 @@ Continue in background + + + Debug info (dev only) + diff --git a/src/com/android/documentsui/base/DocumentInfo.java b/src/com/android/documentsui/base/DocumentInfo.java index c9c4d6621..c27e9c653 100644 --- a/src/com/android/documentsui/base/DocumentInfo.java +++ b/src/com/android/documentsui/base/DocumentInfo.java @@ -257,6 +257,14 @@ public class DocumentInfo implements Durable, Parcelable { return (flags & Document.FLAG_SUPPORTS_RENAME) != 0; } + public boolean isThumbnailSupported() { + return (flags & Document.FLAG_SUPPORTS_THUMBNAIL) != 0; + } + + public boolean isWeblinkSupported() { + return false; // web link support not back ported to arc-apps. + } + public boolean isArchive() { return ArchivesProvider.isSupportedArchiveType(mimeType); } diff --git a/src/com/android/documentsui/files/ActionHandler.java b/src/com/android/documentsui/files/ActionHandler.java index 42bd76ad4..922f0c002 100644 --- a/src/com/android/documentsui/files/ActionHandler.java +++ b/src/com/android/documentsui/files/ActionHandler.java @@ -58,7 +58,7 @@ import com.android.documentsui.clipping.UrisSupplier; import com.android.documentsui.dirlist.AnimationView; import com.android.documentsui.dirlist.DocumentDetails; import com.android.documentsui.files.ActionHandler.Addons; -import com.android.documentsui.inspector.DocumentInspectorActivity; +import com.android.documentsui.inspector.InspectorActivity; import com.android.documentsui.queries.SearchViewManager; import com.android.documentsui.roots.ProvidersAccess; import com.android.documentsui.selection.Selection; @@ -677,11 +677,11 @@ public class ActionHandler extends AbstractActionHa @Override public void showInspector(DocumentInfo doc) { Metrics.logUserAction(mActivity, Metrics.USER_ACTION_INSPECTOR); - Intent intent = new Intent(mActivity, DocumentInspectorActivity.class); + Intent intent = new Intent(mActivity, InspectorActivity.class); intent.putExtra( Shared.EXTRA_SHOW_DEBUG, mFeatures.isDebugSupportEnabled() - && DebugFlags.getDocumentDetailsEnabled()); + || DebugFlags.getDocumentDetailsEnabled()); intent.setData(doc.derivedUri); mActivity.startActivity(intent); } diff --git a/src/com/android/documentsui/inspector/DebugView.java b/src/com/android/documentsui/inspector/DebugView.java index c4e26d304..581e7542c 100644 --- a/src/com/android/documentsui/inspector/DebugView.java +++ b/src/com/android/documentsui/inspector/DebugView.java @@ -18,6 +18,7 @@ package com.android.documentsui.inspector; import android.content.Context; import android.util.AttributeSet; +import com.android.documentsui.R; import com.android.documentsui.base.DocumentInfo; import java.util.function.Consumer; @@ -41,19 +42,25 @@ public class DebugView extends TableView implements Consumer { @Override public void accept(DocumentInfo info) { - addRow("uri", info.derivedUri); - addRow("docid", info.documentId); - addRow("mimetype: ", info.mimeType); - addRow("container", info.isContainer()); - addRow("virtual", info.isVirtual()); - addRow("supports create", info.isCreateSupported()); - addRow("supports delete", info.isDeleteSupported()); - addRow("supports rename", info.isRenameSupported()); + setTitle(this, R.string.inspector_debug_section); + + put("Content uri", info.derivedUri); + put("Document id", info.documentId); + put("Mimetype: ", info.mimeType); + put("Is archive", info.isArchive()); + put("Is container", info.isContainer()); + put("Is partial", info.isPartial()); + put("Is virtual", info.isVirtual()); + put("Supports create", info.isCreateSupported()); + put("Supports delete", info.isDeleteSupported()); + put("Supports rename", info.isRenameSupported()); + put("Supports settings", info.isSettingsSupported()); + put("Supports thumbnail", info.isThumbnailSupported()); + put("Supports weblink", info.isWeblinkSupported()); + put("Supports write", info.isWriteSupported()); } - private void addRow(String key, Object value) { - KeyValueRow row = createKeyValueRow(this); - row.setKey(key); - row.setValue(String.valueOf(value)); + private void put(String key, Object value) { + put(key, String.valueOf(value)); } } diff --git a/src/com/android/documentsui/inspector/DetailsView.java b/src/com/android/documentsui/inspector/DetailsView.java index 2e07b170c..668a1cb8f 100644 --- a/src/com/android/documentsui/inspector/DetailsView.java +++ b/src/com/android/documentsui/inspector/DetailsView.java @@ -15,29 +15,23 @@ */ package com.android.documentsui.inspector; -import android.annotation.StringRes; import android.content.Context; import android.text.format.DateFormat; import android.text.format.Formatter; import android.util.AttributeSet; -import android.widget.TextView; import com.android.documentsui.DocumentsApplication; import com.android.documentsui.R; import com.android.documentsui.base.DocumentInfo; import com.android.documentsui.base.Lookup; -import java.util.HashMap; -import java.util.Map; import java.util.function.Consumer; /** - * Organizes and Displays the basic details about a file + * Displays the basic details about a file. */ public class DetailsView extends TableView implements Consumer { - private final Map rows = new HashMap(); - public DetailsView(Context context) { this(context, null); } @@ -50,35 +44,31 @@ public class DetailsView extends TableView implements Consumer { super(context, attrs, defStyleAttr); } - private void setRow(@StringRes int keyId, String value) { - if(rows.containsKey(keyId)) { - rows.get(keyId).setValue(value); - } else { - KeyValueRow row = createKeyValueRow(this); - row.setKey(keyId); - row.setValue(value); - rows.put(keyId, row); - } - } - @Override public void accept(DocumentInfo info) { - final Lookup fileTypeLookup - = DocumentsApplication.getFileTypeLookup(getContext()); - setRow(R.string.sort_dimension_file_type, fileTypeLookup.lookup(info.mimeType)); + + Lookup fileTypeLookup = + DocumentsApplication.getFileTypeLookup(getContext()); + + put(R.string.sort_dimension_file_type, fileTypeLookup.lookup(info.mimeType)); + + // TODO: Each of these rows need to be removed if the condition is false and previously + // set. if (info.size > 0) { - setRow(R.string.sort_dimension_size, Formatter.formatFileSize(getContext(), info.size)); + put(R.string.sort_dimension_size, Formatter.formatFileSize(getContext(), info.size)); } + if (info.lastModified > 0) { - setRow(R.string.sort_dimension_date, + put(R.string.sort_dimension_date, DateFormat.getDateFormat(getContext()).format(info.lastModified)); } - if(info.numberOfChildren != -1) { - setRow(R.string.directory_children, String.valueOf(info.numberOfChildren)); + + if (info.numberOfChildren != -1) { + put(R.string.directory_children, String.valueOf(info.numberOfChildren)); } if (info.summary != null) { - setRow(R.string.sort_dimension_summary, info.summary); + put(R.string.sort_dimension_summary, info.summary); } } } \ No newline at end of file diff --git a/src/com/android/documentsui/inspector/DocumentInspectorActivity.java b/src/com/android/documentsui/inspector/DocumentInspectorActivity.java deleted file mode 100644 index c8d01c01b..000000000 --- a/src/com/android/documentsui/inspector/DocumentInspectorActivity.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.documentsui.inspector; - -import android.app.Activity; -import android.app.FragmentManager; -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; -import android.view.MenuItem; -import android.view.Window; -import android.widget.Toolbar; - -import com.android.documentsui.R; -import com.android.documentsui.base.Shared; - -public class DocumentInspectorActivity extends Activity { - - private DocumentInspectorFragment mFragment; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - requestWindowFeature(Window.FEATURE_ACTION_BAR); - setContentView(R.layout.document_inspector_activity); - - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setActionBar(toolbar); - getActionBar().setDisplayHomeAsUpEnabled(true); - - FragmentManager fragmentManager = getFragmentManager(); - mFragment = (DocumentInspectorFragment) fragmentManager.findFragmentById( - R.id.fragment_container); - - if (mFragment == null) { - Intent intent = getIntent(); - - mFragment = DocumentInspectorFragment.newInstance(intent); - - - fragmentManager.beginTransaction() - .add(R.id.fragment_container, mFragment) - .commit(); - } - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - finish(); - return true; - } - return super.onOptionsItemSelected(item); - } -} diff --git a/src/com/android/documentsui/inspector/DocumentInspectorFragment.java b/src/com/android/documentsui/inspector/DocumentInspectorFragment.java deleted file mode 100644 index 5e10cf761..000000000 --- a/src/com/android/documentsui/inspector/DocumentInspectorFragment.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.documentsui.inspector; - -import static com.android.internal.util.Preconditions.checkArgument; - -import android.app.Fragment; -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ScrollView; - -import com.android.documentsui.R; -import com.android.documentsui.base.Shared; -import com.android.documentsui.inspector.InspectorController.Loader; - -/** - * Displays the Properties view in Files. - */ -public class DocumentInspectorFragment extends Fragment { - - private static final String DOC_URI_ARG = "docUri"; - private InspectorController mController; - private ScrollView mView; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - final Loader loader = new DocumentLoader(getActivity(), getLoaderManager()); - - mView = (ScrollView) inflater.inflate(R.layout.document_inspector_fragment, - container, false); - boolean showDebug = (boolean) getArguments().get(Shared.EXTRA_SHOW_DEBUG); - mController = new InspectorController(getActivity(), loader, mView, showDebug); - return mView; - } - - @Override - public void onStart() { - super.onStart(); - Uri uri = (Uri) getArguments().get(DOC_URI_ARG); - mController.loadInfo(uri); - } - - @Override - public void onStop() { - super.onStop(); - mController.reset(); - } - - /** - * Creates a fragment and sets a Uri as an argument. - */ - public static DocumentInspectorFragment newInstance(Intent intent) { - Uri uri = intent.getData(); - boolean showDebug = intent.getBooleanExtra(Shared.EXTRA_SHOW_DEBUG, false); - - checkArgument(uri.getScheme().equals("content")); - Bundle args = new Bundle(); - args.putParcelable(DOC_URI_ARG, uri); - args.putBoolean(Shared.EXTRA_SHOW_DEBUG, showDebug); - - DocumentInspectorFragment fragment = new DocumentInspectorFragment(); - fragment.setArguments(args); - return fragment; - } -} diff --git a/src/com/android/documentsui/inspector/InspectorActivity.java b/src/com/android/documentsui/inspector/InspectorActivity.java new file mode 100644 index 000000000..44af73580 --- /dev/null +++ b/src/com/android/documentsui/inspector/InspectorActivity.java @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.documentsui.inspector; + +import android.app.Activity; +import android.app.FragmentManager; +import android.content.Intent; +import android.os.Bundle; +import android.view.MenuItem; +import android.view.Window; +import android.widget.Toolbar; + +import com.android.documentsui.R; + +public class InspectorActivity extends Activity { + + private InspectorFragment mFragment; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + requestWindowFeature(Window.FEATURE_ACTION_BAR); + setContentView(R.layout.document_inspector_activity); + + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setActionBar(toolbar); + getActionBar().setDisplayHomeAsUpEnabled(true); + + FragmentManager fragmentManager = getFragmentManager(); + mFragment = (InspectorFragment) fragmentManager.findFragmentById( + R.id.fragment_container); + + if (mFragment == null) { + Intent intent = getIntent(); + + mFragment = InspectorFragment.newInstance(intent); + + + fragmentManager.beginTransaction() + .add(R.id.fragment_container, mFragment) + .commit(); + } + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + finish(); + return true; + } + return super.onOptionsItemSelected(item); + } +} diff --git a/src/com/android/documentsui/inspector/InspectorFragment.java b/src/com/android/documentsui/inspector/InspectorFragment.java new file mode 100644 index 000000000..ef7c3b1f4 --- /dev/null +++ b/src/com/android/documentsui/inspector/InspectorFragment.java @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.documentsui.inspector; + +import static com.android.internal.util.Preconditions.checkArgument; + +import android.app.Fragment; +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ScrollView; + +import com.android.documentsui.R; +import com.android.documentsui.base.Shared; +import com.android.documentsui.inspector.InspectorController.Loader; + +/** + * Displays the Properties view in Files. + */ +public class InspectorFragment extends Fragment { + + private static final String DOC_URI_ARG = "docUri"; + private InspectorController mController; + private ScrollView mView; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + final Loader loader = new DocumentLoader(getActivity(), getLoaderManager()); + + mView = (ScrollView) inflater.inflate(R.layout.document_inspector_fragment, + container, false); + boolean showDebug = (boolean) getArguments().get(Shared.EXTRA_SHOW_DEBUG); + mController = new InspectorController(getActivity(), loader, mView, showDebug); + return mView; + } + + @Override + public void onStart() { + super.onStart(); + Uri uri = (Uri) getArguments().get(DOC_URI_ARG); + mController.loadInfo(uri); + } + + @Override + public void onStop() { + super.onStop(); + mController.reset(); + } + + /** + * Creates a fragment and sets a Uri as an argument. + */ + public static InspectorFragment newInstance(Intent intent) { + Uri uri = intent.getData(); + boolean showDebug = intent.getBooleanExtra(Shared.EXTRA_SHOW_DEBUG, false); + + checkArgument(uri.getScheme().equals("content")); + Bundle args = new Bundle(); + args.putParcelable(DOC_URI_ARG, uri); + args.putBoolean(Shared.EXTRA_SHOW_DEBUG, showDebug); + + InspectorFragment fragment = new InspectorFragment(); + fragment.setArguments(args); + return fragment; + } +} diff --git a/src/com/android/documentsui/inspector/TableView.java b/src/com/android/documentsui/inspector/TableView.java index 96849730e..91c30d844 100644 --- a/src/com/android/documentsui/inspector/TableView.java +++ b/src/com/android/documentsui/inspector/TableView.java @@ -15,14 +15,22 @@ */ package com.android.documentsui.inspector; +import android.annotation.StringRes; import android.content.Context; +import android.content.res.Resources; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.ViewGroup; import android.widget.LinearLayout; +import android.widget.TextView; import com.android.documentsui.R; +import java.util.HashMap; +import java.util.Map; + +import javax.annotation.Nullable; + /** * Organizes and Displays the basic details about a file @@ -31,6 +39,10 @@ public class TableView extends LinearLayout { private final LayoutInflater mInflater; + private final Map mRows = new HashMap<>(); + private final Resources mRes; + private @Nullable TextView mTitle; + public TableView(Context context) { this(context, null); } @@ -42,6 +54,15 @@ public class TableView extends LinearLayout { public TableView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + mRes = context.getResources(); + } + + protected void setTitle(ViewGroup parent, @StringRes int title) { + if (mTitle == null) { + mTitle = (TextView) mInflater.inflate(R.layout.inspector_section_title, null); + parent.addView(mTitle); + } + mTitle.setText(mContext.getResources().getString(title)); } protected KeyValueRow createKeyValueRow(ViewGroup parent) { @@ -49,4 +70,25 @@ public class TableView extends LinearLayout { parent.addView(row); return row; } + + /** + * Puts or updates an value in the table view. + */ + protected void put(@StringRes int keyId, String value) { + put(mRes.getString(keyId), value); + } + + /** + * Puts or updates an value in the table view. + */ + protected void put(String key, String value) { + if(mRows.containsKey(key)) { + mRows.get(key).setValue(value); + } else { + KeyValueRow row = createKeyValueRow(this); + row.setKey(key); + row.setValue(value); + mRows.put(key, row); + } + } } diff --git a/src/com/android/documentsui/inspector/actions/Action.java b/src/com/android/documentsui/inspector/actions/Action.java index 12f6c1efe..1b0b69379 100644 --- a/src/com/android/documentsui/inspector/actions/Action.java +++ b/src/com/android/documentsui/inspector/actions/Action.java @@ -22,6 +22,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.graphics.drawable.Drawable; + import com.android.documentsui.base.DocumentInfo; /** diff --git a/src/com/android/documentsui/inspector/actions/ActionView.java b/src/com/android/documentsui/inspector/actions/ActionView.java index 78a41fe66..485e2b1b6 100644 --- a/src/com/android/documentsui/inspector/actions/ActionView.java +++ b/src/com/android/documentsui/inspector/actions/ActionView.java @@ -24,6 +24,7 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; + import com.android.documentsui.R; import com.android.documentsui.inspector.InspectorController; @@ -33,7 +34,6 @@ import com.android.documentsui.inspector.InspectorController; */ public final class ActionView extends LinearLayout implements InspectorController.ActionDisplay { - private final Context mContext; private final TextView mHeader; private final ImageView mAppIcon; private final TextView mAppName; @@ -55,7 +55,6 @@ public final class ActionView extends LinearLayout implements InspectorControlle View view = inflater.inflate(R.layout.inspector_action_view, null); addView(view); - mContext = context; mHeader = (TextView) findViewById(R.id.action_header); mAppIcon = (ImageView) findViewById(R.id.app_icon); mAppName = (TextView) findViewById(R.id.app_name); diff --git a/src/com/android/documentsui/inspector/actions/ClearDefaultAppAction.java b/src/com/android/documentsui/inspector/actions/ClearDefaultAppAction.java index 62c8f9489..4c355d068 100644 --- a/src/com/android/documentsui/inspector/actions/ClearDefaultAppAction.java +++ b/src/com/android/documentsui/inspector/actions/ClearDefaultAppAction.java @@ -15,15 +15,14 @@ */ package com.android.documentsui.inspector.actions; -import android.annotation.Nullable; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.graphics.drawable.Drawable; -import android.net.Uri; + import com.android.documentsui.R; import com.android.documentsui.base.DocumentInfo; + import java.util.List; /** diff --git a/src/com/android/documentsui/inspector/actions/ShowInProviderAction.java b/src/com/android/documentsui/inspector/actions/ShowInProviderAction.java index 50a2a1054..ed36f092f 100644 --- a/src/com/android/documentsui/inspector/actions/ShowInProviderAction.java +++ b/src/com/android/documentsui/inspector/actions/ShowInProviderAction.java @@ -17,10 +17,9 @@ package com.android.documentsui.inspector.actions; import static android.provider.DocumentsContract.Document.FLAG_SUPPORTS_SETTINGS; -import android.annotation.Nullable; import android.content.Context; import android.content.pm.PackageManager; -import android.graphics.drawable.Drawable; + import com.android.documentsui.R; import com.android.documentsui.base.DocumentInfo; import com.android.documentsui.roots.ProvidersAccess; diff --git a/tests/functional/com/android/documentsui/FilesActivityUiTest.java b/tests/functional/com/android/documentsui/FilesActivityUiTest.java index 07f3417b7..87f3bac21 100644 --- a/tests/functional/com/android/documentsui/FilesActivityUiTest.java +++ b/tests/functional/com/android/documentsui/FilesActivityUiTest.java @@ -22,7 +22,7 @@ import android.os.RemoteException; import android.support.test.filters.LargeTest; import com.android.documentsui.files.FilesActivity; -import com.android.documentsui.inspector.DocumentInspectorActivity; +import com.android.documentsui.inspector.InspectorActivity; @LargeTest public class FilesActivityUiTest extends ActivityTest { @@ -116,7 +116,7 @@ public class FilesActivityUiTest extends ActivityTest { return; } Instrumentation.ActivityMonitor monitor = new Instrumentation.ActivityMonitor( - DocumentInspectorActivity.class.getName(), null, false); + InspectorActivity.class.getName(), null, false); bots.directory.selectDocument("file0.log"); bots.main.clickActionItem("Properties"); monitor.waitForActivityWithTimeout(TIMEOUT); diff --git a/tests/functional/com/android/documentsui/InspectorUiTest.java b/tests/functional/com/android/documentsui/InspectorUiTest.java index cdb9f60dd..724ba1d52 100644 --- a/tests/functional/com/android/documentsui/InspectorUiTest.java +++ b/tests/functional/com/android/documentsui/InspectorUiTest.java @@ -20,14 +20,14 @@ import android.net.Uri; import android.provider.DocumentsContract; import com.android.documentsui.bots.UiBot; -import com.android.documentsui.inspector.DocumentInspectorActivity; +import com.android.documentsui.inspector.InspectorActivity; -public class InspectorUiTest extends ActivityTest { +public class InspectorUiTest extends ActivityTest { private static final String TEST_DOC_NAME = "test.txt"; public InspectorUiTest() { - super(DocumentInspectorActivity.class); + super(InspectorActivity.class); } @Override -- cgit v1.2.3-59-g8ed1b