diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 0a1efc1635..6a37816504 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -177,8 +177,8 @@
     </declare-styleable>
 
     <declare-styleable name="GridSize">
-        <attr name="minDeviceWidthPx" format="float"/>
-        <attr name="minDeviceHeightPx" format="float"/>
+        <attr name="minDeviceWidth" format="dimension"/>
+        <attr name="minDeviceHeight" format="dimension"/>
         <attr name="numGridRows" format="integer"/>
         <attr name="numGridColumns" format="integer"/>
         <attr name="dbFile" />
diff --git a/res/xml/spec_col_count_3_row.xml b/res/xml/spec_col_count_3_row.xml
index bbde54297f..e0ef5c1915 100644
--- a/res/xml/spec_col_count_3_row.xml
+++ b/res/xml/spec_col_count_3_row.xml
@@ -19,15 +19,15 @@
         launcher:numGridRows="3"
         launcher:dbFile="launcher_7_by_3.db"
         launcher:defaultLayoutId="@xml/default_workspace_7x3"
-        launcher:minDeviceWidthPx="0"
-        launcher:minDeviceHeightPx="0"
+        launcher:minDeviceWidth="0px"
+        launcher:minDeviceHeight="0px"
         />
     <GridSize
         launcher:numGridColumns="8"
         launcher:numGridRows="3"
         launcher:dbFile="launcher_8_by_3.db"
         launcher:defaultLayoutId="@xml/default_workspace_8x3"
-        launcher:minDeviceWidthPx="0"
-        launcher:minDeviceHeightPx="2093"
+        launcher:minDeviceWidth="0px"
+        launcher:minDeviceHeight="2093px"
         />
-</GridSizeSpecs>
\ No newline at end of file
+</GridSizeSpecs>
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index f963913db1..9991c8c5ee 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -1209,8 +1209,8 @@ public class InvariantDeviceProfile {
 
             mNumRows = (int) a.getFloat(R.styleable.GridSize_numGridRows, 0);
             mNumColumns = (int) a.getFloat(R.styleable.GridSize_numGridColumns, 0);
-            mMinDeviceWidthPx = a.getFloat(R.styleable.GridSize_minDeviceWidthPx, 0);
-            mMinDeviceHeightPx = a.getFloat(R.styleable.GridSize_minDeviceHeightPx, 0);
+            mMinDeviceWidthPx = a.getDimensionPixelSize(R.styleable.GridSize_minDeviceWidth, 0);
+            mMinDeviceHeightPx = a.getDimensionPixelSize(R.styleable.GridSize_minDeviceHeight, 0);
             mDbFile = a.getString(R.styleable.GridSize_dbFile);
             mDefaultLayoutId = a.getResourceId(
                     R.styleable.GridSize_defaultLayoutId, 0);