Merge "Make chooser full-width in phone-portrait orientation" into main

3 files changed, 23 insertions, 3 deletions

diff --git a/java/res/values-port/dimens.xml b/java/res/values-port/dimens.xml
new file mode 100644
index 00000000..100a7e17
--- /dev/null
+++ b/java/res/values-port/dimens.xml
@@ -0,0 +1,18 @@
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <dimen name="chooser_width">-1px</dimen>
+</resources>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 6590d70e..ae80815b 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -20,7 +20,7 @@
     <dimen name="chooser_action_corner_radius">28dp</dimen>
     <dimen name="chooser_action_horizontal_margin">2dp</dimen>
     <dimen name="chooser_action_max_width">200dp</dimen>
-    <dimen name="chooser_width">412dp</dimen>
+    <dimen name="chooser_width">450dp</dimen>
     <dimen name="chooser_corner_radius">28dp</dimen>
     <dimen name="chooser_corner_radius_small">14dp</dimen>
     <dimen name="chooser_row_text_option_translate">25dp</dimen>
diff --git a/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java b/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java
index 77ae20f5..fadea934 100644
--- a/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java
+++ b/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java
@@ -164,8 +164,10 @@ public final class ChooserGridAdapter extends RecyclerView.Adapter<RecyclerView.
             return false;
         }
 
-        // Limit width to the maximum width of the chooser activity
-        width = Math.min(mChooserWidthPixels, width);
+        // Limit width to the maximum width of the chooser activity, if the maximum width is set
+        if (mChooserWidthPixels >= 0) {
+            width = Math.min(mChooserWidthPixels, width);
+        }
 
         int newWidth = width / mMaxTargetsPerRow;
         if (newWidth != mChooserTargetWidth) {