summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJonathan Miranda <jonmiranda@google.com>2017-08-28 21:48:34 +0000
committerJonathan Miranda <jonmiranda@google.com>2017-08-28 21:48:34 +0000
commit8aef0b1a5d23937cc7a0466b4888cdb47bba2e40 (patch)
tree557d210af661863aac253f37ce869cf8c521b531 /src
parent65289b6d5d32197cfdfc940f64199d29515e56d1 (diff)
parent7fb9e712e8fe7967b0368e5ebc8606db530b4dc7 (diff)
downloadandroid_packages_apps_Trebuchet-8aef0b1a5d23937cc7a0466b4888cdb47bba2e40.tar.gz
android_packages_apps_Trebuchet-8aef0b1a5d23937cc7a0466b4888cdb47bba2e40.tar.bz2
android_packages_apps_Trebuchet-8aef0b1a5d23937cc7a0466b4888cdb47bba2e40.zip
[automerger] Increase overview icon zone percentage from 20% to 22%. am: 7fb9e712e8
Change-Id: Ia8eec3f9a609a74a82dd4328d95c8cc6587ac1c0
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/DeviceProfile.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 150bc5309..c8e4c4908 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);
}