Merge changes from topic "am-2b82a146-0fd5-4194-a35d-ab67d3739931" into ub-launcher3-master
* changes:
[automerger] Adding support for badging instant app icons. am: f5523921c3
Adding support for badging instant app icons.
diff --git a/res/values/config.xml b/res/values/config.xml
index 01772f1..10b612b 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 @@
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 @@
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);
}