summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2017-08-28 21:35:39 (GMT)
committerJon Miranda <jonmiranda@google.com>2017-08-28 21:47:59 (GMT)
commit7fb9e712e8fe7967b0368e5ebc8606db530b4dc7 (patch)
tree775db93d6237915c707d03abd7a3a691a809daf2
parent1ad3c8f61edd7ff205530846e6e7c049583b8964 (diff)
downloadandroid_packages_apps_Trebuchet-7fb9e712e8fe7967b0368e5ebc8606db530b4dc7.zip
android_packages_apps_Trebuchet-7fb9e712e8fe7967b0368e5ebc8606db530b4dc7.tar.gz
android_packages_apps_Trebuchet-7fb9e712e8fe7967b0368e5ebc8606db530b4dc7.tar.bz2
Increase overview icon zone percentage from 20% to 22%.
This handles the case where "Home Settings" text is split into two lines and is cropped when the user is in multi-window mode with settings Display=Largest and Font=Largest. Bug: 64976707 Change-Id: Ia1a4ee35a94a2fbe99f8ed25fce93a023e621147
-rw-r--r--res/values/config.xml2
-rw-r--r--src/com/android/launcher3/DeviceProfile.java9
2 files changed, 6 insertions, 5 deletions
diff --git a/res/values/config.xml b/res/values/config.xml
index b41172b..7cf06a8 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -1,7 +1,7 @@
<resources>
<!-- Dynamic Grid -->
<!-- Out of 100, the percent of space the overview bar should try and take vertically. -->
- <integer name="config_dynamic_grid_overview_icon_zone_percentage">20</integer>
+ <integer name="config_dynamic_grid_overview_icon_zone_percentage">22</integer>
<!-- Miscellaneous -->
<bool name="config_largeHeap">false</bool>
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 150bc53..c8e4c49 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -555,9 +555,9 @@ public class DeviceProfile {
int getOverviewModeButtonBarHeight() {
int zoneHeight = (int) (overviewModeIconZoneRatio * availableHeightPx);
- zoneHeight = Math.min(overviewModeMaxIconZoneHeightPx,
- Math.max(overviewModeMinIconZoneHeightPx, zoneHeight));
- return zoneHeight;
+ return Utilities.boundToRange(zoneHeight,
+ overviewModeMinIconZoneHeightPx,
+ overviewModeMaxIconZoneHeightPx);
}
public static int calculateCellWidth(int width, int countX) {
@@ -693,7 +693,8 @@ public class DeviceProfile {
lp = (FrameLayout.LayoutParams) overviewMode.getLayoutParams();
lp.width = Math.min(availableWidthPx, maxWidth);
- lp.height = getOverviewModeButtonBarHeight() + mInsets.bottom;
+ lp.height = getOverviewModeButtonBarHeight();
+ lp.bottomMargin = mInsets.bottom;
overviewMode.setLayoutParams(lp);
}