Extract cell size information to responsive grid structure
Bug: 287975993
Flag: ACONFIG com.android.launcher3.enable_responsive_workspace TEAMFOOD
Test: ResponsiveCellSpecsProviderTest
Test: DeviceProfileDumpTest
Test: DeviceProfileResponsiveDumpTest
Change-Id: I26a87d9b690fdfcff1599d862c09e97fe9f9f930
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 3682830..20e7089 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -220,6 +220,14 @@
Needs FeatureFlags.ENABLE_RESPONSIVE_WORKSPACE enabled -->
<attr name="hotseatSpecsId" format="reference" />
<attr name="hotseatSpecsTwoPanelId" format="reference" />
+ <!-- File that contains the specs for workspace icon and text size.
+ Needs FeatureFlags.ENABLE_RESPONSIVE_WORKSPACE enabled -->
+ <attr name="workspaceCellSpecsId" format="reference" />
+ <attr name="workspaceCellSpecsTwoPanelId" format="reference" />
+ <!-- File that contains the specs for all apps icon and text size.
+ Needs FeatureFlags.ENABLE_RESPONSIVE_WORKSPACE enabled -->
+ <attr name="allAppsCellSpecsId" format="reference" />
+ <attr name="allAppsCellSpecsTwoPanelId" format="reference" />
<!-- By default all categories are enabled -->
<attr name="deviceCategory" format="integer">
@@ -292,6 +300,11 @@
<attr name="maxAvailableSize" />
</declare-styleable>
+ <declare-styleable name="CellSpec">
+ <attr name="dimensionType" />
+ <attr name="maxAvailableSize" />
+ </declare-styleable>
+
<declare-styleable name="SizeSpec">
<attr name="fixedSize" format="dimension" />
<attr name="ofAvailableSpace" format="float" />
diff --git a/res/values/config.xml b/res/values/config.xml
index 4b15a6b..154312a 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -228,6 +228,10 @@
<dimen name="iconSize60dp">66dp</dimen>
<dimen name="iconSize66dp">72dp</dimen>
<dimen name="iconSize72dp">79dp</dimen>
+ <dimen name="iconSize82dp">90dp</dimen>
+ <dimen name="iconSize110dp">121dp</dimen>
+ <dimen name="iconSize144dp">158dp</dimen>
+
<!-- Icon size steps in dp -->
<integer-array name="icon_size_steps">
@@ -240,6 +244,9 @@
<item>@dimen/iconSize60dp</item>
<item>@dimen/iconSize66dp</item>
<item>@dimen/iconSize72dp</item>
+ <item>@dimen/iconSize82dp</item>
+ <item>@dimen/iconSize110dp</item>
+ <item>@dimen/iconSize144dp</item>
</integer-array>
<dimen name="minimum_icon_label_size">8sp</dimen>