| Index: chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java
|
| index 18b21dc42e07bf2b1f21a715fdb49477c02aecd9..ec2622b6f6b4bcfd5d214790d6b6214281c54c96 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java
|
| @@ -8,6 +8,7 @@ import android.app.Activity;
|
| import android.content.Context;
|
| import android.graphics.Bitmap;
|
| import android.graphics.Rect;
|
| +import android.support.annotation.Nullable;
|
| import android.support.v7.widget.GridLayoutManager;
|
| import android.support.v7.widget.RecyclerView;
|
| import android.util.LruCache;
|
| @@ -16,6 +17,7 @@ import android.view.View;
|
| import android.widget.Button;
|
| import android.widget.RelativeLayout;
|
|
|
| +import org.chromium.base.VisibleForTesting;
|
| import org.chromium.chrome.R;
|
| import org.chromium.chrome.browser.widget.selection.SelectableListLayout;
|
| import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
|
| @@ -90,8 +92,10 @@ public class PickerCategoryView extends RelativeLayout
|
| // Whether the connection to the service has been established.
|
| private boolean mServiceReady;
|
|
|
| - public PickerCategoryView(Context context) {
|
| + public PickerCategoryView(Context context, @Nullable List<PickerBitmap> testFiles) {
|
| super(context);
|
| +
|
| + mPickerBitmaps = testFiles;
|
| postConstruction(context);
|
| }
|
|
|
| @@ -106,7 +110,9 @@ public class PickerCategoryView extends RelativeLayout
|
| mDecoderServiceHost = new DecoderServiceHost(this);
|
| mDecoderServiceHost.bind(mContext);
|
|
|
| - enumerateBitmaps();
|
| + if (mPickerBitmaps == null) {
|
| + enumerateBitmaps();
|
| + }
|
|
|
| mSelectionDelegate = new SelectionDelegate<PickerBitmap>();
|
|
|
| @@ -344,4 +350,9 @@ public class PickerCategoryView extends RelativeLayout
|
| outRect.set(left, top, right, bottom);
|
| }
|
| }
|
| +
|
| + @VisibleForTesting
|
| + public SelectionDelegate<PickerBitmap> getSelectionDelegateForTesting() {
|
| + return mSelectionDelegate;
|
| + }
|
| }
|
|
|