From 2e3b0c11c3290ff0a31d562a4c192fe3536c2cd8 Mon Sep 17 00:00:00 2001 From: Svetoslav Ganov Date: Fri, 5 May 2017 17:58:03 -0700 Subject: [PATCH] Properly measure dataset presentations Test: Autofill CTS tests pass bug:37952199 Change-Id: Iaae714dd483ba44d5c7668b6fc7d386901b9d95c --- .../java/com/android/server/autofill/ui/FillUi.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/autofill/java/com/android/server/autofill/ui/FillUi.java b/services/autofill/java/com/android/server/autofill/ui/FillUi.java index dd297a645436c..1935c7b52884a 100644 --- a/services/autofill/java/com/android/server/autofill/ui/FillUi.java +++ b/services/autofill/java/com/android/server/autofill/ui/FillUi.java @@ -265,8 +265,11 @@ final class FillUi { mContentWidth = 0; mContentHeight = 0; - final int widthMeasureSpec = MeasureSpec.makeMeasureSpec(MeasureSpec.UNSPECIFIED, 0); - final int heightMeasureSpec = MeasureSpec.makeMeasureSpec(MeasureSpec.UNSPECIFIED, 0); + final int widthMeasureSpec = MeasureSpec.makeMeasureSpec(maxSize.x, + MeasureSpec.AT_MOST); + final int heightMeasureSpec = MeasureSpec.makeMeasureSpec(maxSize.y, + MeasureSpec.AT_MOST); + final int itemCount = Math.min(mAdapter.getCount(), VISIBLE_OPTIONS_MAX_COUNT); for (int i = 0; i < itemCount; i++) { View view = mAdapter.getItem(i).getView();