Merge "Set a minimum height for invocation lights" into qt-qpr1-dev

am: bec44cdd6f

Change-Id: I974f4b85e1d48d6c22a8583657e31e4fc9835851
This commit is contained in:
Miranda Kephart
2019-08-19 16:28:49 -07:00
committed by android-build-merger

View File

@@ -100,7 +100,9 @@ public class InvocationLightsView extends View
int cornerRadiusBottom = DisplayUtils.getCornerRadiusBottom(context);
int cornerRadiusTop = DisplayUtils.getCornerRadiusTop(context);
mViewHeight = Math.max(cornerRadiusBottom, cornerRadiusTop);
// ensure that height is non-zero even for square corners
mViewHeight = Math.max(Math.max(cornerRadiusBottom, cornerRadiusTop),
DisplayUtils.convertDpToPx(LIGHT_HEIGHT_DP, context));
final int dualToneDarkTheme = Utils.getThemeAttr(mContext, R.attr.darkIconTheme);
final int dualToneLightTheme = Utils.getThemeAttr(mContext, R.attr.lightIconTheme);