am 33243355: am 54103eb3: Merge "Adding additional checks to prevent launcher crash when we can\'t compose animation buffer. (Bug: 5478481)" into ics-mr0
* commit '3324335515dc6525b312adef5e548925e73725b5':
Adding additional checks to prevent launcher crash when we can't compose animation buffer. (Bug: 5478481)
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 124cf16..87b0c00 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -56,6 +56,8 @@
external icon width/height above to compensate -->
<dimen name="apps_customize_tab_bar_height">52dp</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">74dp</dimen>
<dimen name="apps_customize_cell_height">82dp</dimen>
@@ -64,6 +66,7 @@
<dimen name="apps_customize_widget_cell_height_gap">8dp</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