am ff648b55: Issue 5218087, HONEYCOMB_MR2 -> ICE_CREAM_SANDWICH for widget padding

* commit 'ff648b5512d1af9f5863aa97677a7a3e108ad1dd':
  Issue 5218087, HONEYCOMB_MR2 -> ICE_CREAM_SANDWICH for widget padding
This commit is contained in:
Adam Cohen
2011-09-19 13:05:53 -07:00
committed by Android Git Automerger
3 changed files with 5 additions and 7 deletions
-4
View File
@@ -20,8 +20,4 @@
<bool name="config_useDropTargetDownTransition">false</bool>
<!-- Whether or not to fade the side pages -->
<bool name="config_workspaceFadeAdjacentScreens">false</bool>
<!-- Padding applied to AppWidgets -->
<dimen name="app_widget_padding_top">8dp</dimen>
<dimen name="app_widget_padding_bottom">8dp</dimen>
</resources>
+4
View File
@@ -67,6 +67,10 @@
<integer name="apps_customize_cling_focused_x">2</integer>
<integer name="apps_customize_cling_focused_y">1</integer>
<!-- Padding applied to AppWidgets -->
<dimen name="app_widget_padding_top">8dp</dimen>
<dimen name="app_widget_padding_bottom">8dp</dimen>
<!-- Folders -->
<!-- The size of the image which sits behind the preview of the folder contents -->
<dimen name="folder_preview_size">58dp</dimen>
+1 -3
View File
@@ -874,9 +874,7 @@ public final class Launcher extends Activity
return p;
}
// TODO: This should be ICE_CREAM_SANDWICH, but since the unbundled apps
// may not have updated their targetSdkVersion yet, we've bumped it down for now.
if (appInfo.targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB_MR2) {
if (appInfo.targetSdkVersion >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
Resources r = getResources();
p.left = r.getDimensionPixelSize(R.dimen.app_widget_padding_left);
p.right = r.getDimensionPixelSize(R.dimen.app_widget_padding_right);