Merge "Add more border space options" into tm-dev am: c307cd137f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17252662 Change-Id: Ie09dde59b68d3b453b92c50e0928c1976e239adf
This commit is contained in:
@@ -215,6 +215,13 @@
|
||||
<attr name="borderSpaceHorizontal" format="float" />
|
||||
<!-- space below the cell, defaults to borderSpace if not specified -->
|
||||
<attr name="borderSpaceVertical" format="float" />
|
||||
<!-- space to be used horizontally and vertically,
|
||||
defaults to borderSpace if not specified -->
|
||||
<attr name="borderSpaceLandscape" format="float" />
|
||||
<!-- space to the right of the cell, defaults to borderSpaceLandscape if not specified -->
|
||||
<attr name="borderSpaceLandscapeHorizontal" format="float" />
|
||||
<!-- space below the cell, defaults to borderSpaceLandscape if not specified -->
|
||||
<attr name="borderSpaceLandscapeVertical" format="float" />
|
||||
<!-- space to be used horizontally and vertically in two panels,
|
||||
defaults to borderSpace if not specified -->
|
||||
<attr name="borderSpaceTwoPanelPortrait" format="float" />
|
||||
|
||||
@@ -838,6 +838,8 @@ public class InvariantDeviceProfile {
|
||||
minCellSize[INDEX_TWO_PANEL_LANDSCAPE] = new PointF(x, y);
|
||||
|
||||
float borderSpace = a.getFloat(R.styleable.ProfileDisplayOption_borderSpace, 0);
|
||||
float borderSpaceLandscape = a.getFloat(
|
||||
R.styleable.ProfileDisplayOption_borderSpaceLandscape, borderSpace);
|
||||
float borderSpaceTwoPanelPortrait = a.getFloat(
|
||||
R.styleable.ProfileDisplayOption_borderSpaceTwoPanelPortrait, borderSpace);
|
||||
float borderSpaceTwoPanelLandscape = a.getFloat(
|
||||
@@ -846,6 +848,11 @@ public class InvariantDeviceProfile {
|
||||
x = a.getFloat(R.styleable.ProfileDisplayOption_borderSpaceHorizontal, borderSpace);
|
||||
y = a.getFloat(R.styleable.ProfileDisplayOption_borderSpaceVertical, borderSpace);
|
||||
borderSpaces[INDEX_DEFAULT] = new PointF(x, y);
|
||||
|
||||
x = a.getFloat(R.styleable.ProfileDisplayOption_borderSpaceLandscapeHorizontal,
|
||||
borderSpaceLandscape);
|
||||
y = a.getFloat(R.styleable.ProfileDisplayOption_borderSpaceLandscapeVertical,
|
||||
borderSpaceLandscape);
|
||||
borderSpaces[INDEX_LANDSCAPE] = new PointF(x, y);
|
||||
|
||||
x = a.getFloat(
|
||||
|
||||
Reference in New Issue
Block a user