Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge \"Allow quick view package to be set via setprop.\" into nyc-mr1-dev am: 24cea93b4a" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-06-30 23:45:20 +00:00
committed by Android (Google) Code Review
parent a22f5a3fb4 265173d85c
commit 35c77908f0
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java
View File

@@ -28,6 +28,7 @@ import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.database.Cursor;
import android.net.Uri;
import android.os.Build;
import android.provider.DocumentsContract;
import android.provider.DocumentsContract.Document;
import android.support.annotation.Nullable;
@@ -73,7 +74,7 @@ final class QuickViewIntentBuilder {
@Nullable Intent build() {
if (DEBUG) Log.d(TAG, "Preparing intent for doc:" + mDocument.documentId);
String trustedPkg = mResources.getString(R.string.trusted_quick_viewer_package);
String trustedPkg = getQuickViewPackage();
if (!TextUtils.isEmpty(trustedPkg)) {
Intent intent = new Intent(Intent.ACTION_QUICK_VIEW);
@@ -116,6 +117,16 @@ final class QuickViewIntentBuilder {
return null;
}
private String getQuickViewPackage() {
String resValue = mResources.getString(R.string.trusted_quick_viewer_package);
if (Build.IS_DEBUGGABLE ) {
// Allow users of debug devices to override default quick viewer
// for the purposes of testing.
return android.os.SystemProperties.get("debug.quick_viewer", resValue);
}
return resValue;
}
private int collectViewableUris(ArrayList<Uri> uris) {
final String[] siblingIds = mModel.getModelIds();
uris.ensureCapacity(siblingIds.length);