Merge "Set a minimum height for invocation lights" into qt-qpr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
bec44cdd6f
@@ -100,7 +100,9 @@ public class InvocationLightsView extends View
|
|||||||
|
|
||||||
int cornerRadiusBottom = DisplayUtils.getCornerRadiusBottom(context);
|
int cornerRadiusBottom = DisplayUtils.getCornerRadiusBottom(context);
|
||||||
int cornerRadiusTop = DisplayUtils.getCornerRadiusTop(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 dualToneDarkTheme = Utils.getThemeAttr(mContext, R.attr.darkIconTheme);
|
||||||
final int dualToneLightTheme = Utils.getThemeAttr(mContext, R.attr.lightIconTheme);
|
final int dualToneLightTheme = Utils.getThemeAttr(mContext, R.attr.lightIconTheme);
|
||||||
|
|||||||
Reference in New Issue
Block a user