summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
author Andrey Epin <ayepin@google.com> 2023-09-16 00:30:34 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-09-16 00:30:34 +0000
commit7deae72239c266f4a1d3d14ee166fe5b25da7d83 (patch)
tree1c374b617c77db41530125f8acaf96de9eadd6c5 /java/src
parentc7d61dc6a727ffad6e6d26f312e6d5928c93bd6b (diff)
parent369287f575566fda8d2173f3dc76c3388fea18a5 (diff)
Merge "Make chooser full-width in phone-portrait orientation" into main
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/intentresolver/grid/ChooserGridAdapter.java6
1 files changed, 4 insertions, 2 deletions
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) {