From 16479fd3b2960c60136247891db6bc79f1200e93 Mon Sep 17 00:00:00 2001
From: Zhen Zhang <zzhen@google.com>
Date: Tue, 25 Feb 2020 16:56:53 -0800
Subject: [PATCH] Fix Sharesheet grid items not aligned issue

The "layout_width" field was set to fixed dp for the top level
linearlayout of grid item. Changing it to "match_parent" can fix the
issue. The location of inner layouts are centered now.

Bug: 148515684
Test: build and flashed to crosshatch device. Grid items in sharesheet
are aligned.

Change-Id: Id4ab6c44bfadf7caa00b856d3dba6dbb791200b5
---
 core/res/res/layout/resolve_grid_item.xml | 2 +-
 core/res/res/values/dimens.xml            | 1 -
 core/res/res/values/symbols.xml           | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/res/res/layout/resolve_grid_item.xml b/core/res/res/layout/resolve_grid_item.xml
index 9aecfd99098f6..fdd965f3b157e 100644
--- a/core/res/res/layout/resolve_grid_item.xml
+++ b/core/res/res/layout/resolve_grid_item.xml
@@ -18,7 +18,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="vertical"
-              android:layout_width="@dimen/chooser_target_width"
+              android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:minHeight="100dp"
               android:gravity="center"
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index e1d94f50f2607..c9e6dd86245ee 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -764,7 +764,6 @@
     <dimen name="chooser_preview_image_border">1dp</dimen>
     <dimen name="chooser_preview_image_max_dimen">200dp</dimen>
     <dimen name="chooser_preview_width">-1px</dimen>
-    <dimen name="chooser_target_width">90dp</dimen>
     <dimen name="chooser_header_scroll_elevation">4dp</dimen>
     <dimen name="chooser_max_collapsed_height">288dp</dimen>
     <dimen name="chooser_direct_share_label_placeholder_max_width">72dp</dimen>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 3ed3a64e2cb49..797d03f8e940f 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2734,7 +2734,6 @@
   <java-symbol type="string" name="chooser_no_direct_share_targets" />
   <java-symbol type="drawable" name="chooser_row_layer_list" />
   <java-symbol type="dimen" name="chooser_view_spacing" />
-  <java-symbol type="dimen" name="chooser_target_width" />
   <java-symbol type="dimen" name="chooser_edge_margin_thin" />
   <java-symbol type="dimen" name="chooser_edge_margin_normal" />
   <java-symbol type="dimen" name="chooser_preview_image_font_size"/>