commit | 06665dcfa8e19cd9a2598f4c76553c2336c8fcbc | [log] [tgz] |
---|---|---|
author | Chun-Ku Lin <chunkulin@google.com> | Thu Sep 05 20:20:38 2024 +0000 |
committer | Chun-Ku Lin <chunkulin@google.com> | Thu Sep 05 20:20:38 2024 +0000 |
tree | 6904a3ff9f53f2906b987790122e221af42e8478 | |
parent | 4414102186693cc11541c30f2158f87f388a419c [diff] |
Enforce the gridview vertical spacing to be >= 0 In landscape mode on phone, when the viewpager's height is not able to fit the grid items, the calculated vertical spacing is negative number, which results in overlapping text Bug: 361454352 Test: manual. Maxout the display and font size and view the a11yMenu on phone in landscape mode Flag: EXEMPT low risk bugfix Change-Id: I2fea76399ba6f2b2bbb713ab578e00c439dafb04
diff --git a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuViewPager.java b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuViewPager.java index 35f1248..b899c45 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuViewPager.java +++ b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuViewPager.java
@@ -306,6 +306,10 @@ (viewPagerHeight - topMargin - defaultMargin - (rowsInGridView * gridItemHeight)) / (rowsInGridView + 1); + // The interval is negative number when the viewPagerHeight is not able to fit + // the grid items, which result in text overlapping. + // Adjust the interval to 0 could solve the issue. + interval = Math.max(interval, 0); mViewPagerAdapter.setVerticalSpacing(interval); // Sets padding to view pager.