Photo Picker: Much better handling of orientation changes.

Bug: 921425, 656015
Change-Id: Ia5f324ea9c6d3c66c52214af083f597ea55df8b2
Reviewed-on: https://chromium-review.googlesource.com/c/1455950
Auto-Submit: Finnur Thorarinsson <finnur@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Finnur Thorarinsson <finnur@chromium.org>
Cr-Commit-Position: refs/heads/master@{#629972}

chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapView.java

@@ -282,6 +282,9 @@ public class PickerBitmapView extends SelectableItemView<PickerBitmap> {
             mIconView.getLayoutParams().height = imageSizeWithBorders();
             mIconView.getLayoutParams().width = imageSizeWithBorders();
             addPaddingToParent(mIconView, mBorder);
+        } else {
+            mIconView.getLayoutParams().height = mCategoryView.getImageSize();
+            mIconView.getLayoutParams().width = mCategoryView.getImageSize();
         }
 
         boolean noImageWasLoaded = !mImageLoaded;

chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java

@@ -12,6 +12,7 @@ import android.graphics.Rect;
 import android.os.SystemClock;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.DisplayMetrics;
 import android.util.LruCache;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -183,6 +184,8 @@ public class PickerCategoryView extends RelativeLayout
         mRecyclerView.removeItemDecoration(mSpacingDecoration);
         mSpacingDecoration = new GridSpacingItemDecoration(mColumns, mPadding);
         mRecyclerView.addItemDecoration(mSpacingDecoration);
+
+        mPickerAdapter.notifyDataSetChanged();
     }
 
     /**
@@ -335,10 +338,10 @@ public class PickerCategoryView extends RelativeLayout
      * Calculates image size and how many columns can fit on-screen.
      */
     private void calculateGridMetrics() {
-        Rect appRect = new Rect();
-        mActivity.getWindow().getDecorView().getWindowVisibleDisplayFrame(appRect);
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        mActivity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
 
-        int width = appRect.width();
+        int width = displayMetrics.widthPixels;
         int minSize =
                 mActivity.getResources().getDimensionPixelSize(R.dimen.photo_picker_tile_min_size);
         mPadding = mActivity.getResources().getDimensionPixelSize(R.dimen.photo_picker_tile_gap);