Move app_icon_content_size setting to generic dimens.xml
Fixes crash when booting on some screen resolutions
Change-Id: Iafbbc6e9ce64a007a99507ec408dfcfe27a64c97
Signed-off-by: Mike Lockwood <lockwood@android.com>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 3fe53b5..1b806a6 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -41,8 +41,6 @@
<!-- Size of icons in workspace -->
<dimen name="app_icon_size">72dp</dimen>
- <!-- Size of content of icons in workspace, as specified by the android icon guidelines -->
- <dimen name="app_icon_content_size">60dp</dimen>
<!-- extra horizontal spacing between mini screen thumbnails ie. in all
apps and in customization mode -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ab24d5b..5a66ef2 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -50,6 +50,8 @@
external icon width/height above to compensate -->
<dimen name="apps_customize_tab_bar_height">56dp</dimen>
<dimen name="app_icon_size">48dp</dimen>
+ <!-- Size of content of icons in workspace, as specified by the android icon guidelines -->
+ <dimen name="app_icon_content_size">60dp</dimen>
<!-- The width can be 72dp because we don't have L/R padding -->
<dimen name="apps_customize_cell_width">72dp</dimen>
<dimen name="apps_customize_cell_height">80dp</dimen>
@@ -58,6 +60,7 @@
<dimen name="apps_customize_widget_cell_height_gap">10dp</dimen>
<dimen name="title_texture_width">120px</dimen>
+
<!-- height of the bottom row of controls -->
<dimen name="button_bar_height">64dip</dimen>
<!-- Because portal animations go beyond the bounds of an icon, we need