summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-05-01 13:04:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-01 13:04:00 -0700
commitb84d43338ba9c755f5c5de2d6189223815ed6c8a (patch)
tree049581dd68043a1b848cf6381d5b2c957a2f0f6c
parent9e717923f8f7fc3c88a37603dd298dbd742cb2e9 (diff)
parentd65b23089c90edcf2808ccccf8f918b6155cc2ec (diff)
downloadandroid_packages_apps_Trebuchet-b84d43338ba9c755f5c5de2d6189223815ed6c8a.tar.gz
android_packages_apps_Trebuchet-b84d43338ba9c755f5c5de2d6189223815ed6c8a.tar.bz2
android_packages_apps_Trebuchet-b84d43338ba9c755f5c5de2d6189223815ed6c8a.zip
am d65b2308: Merge "Use public API to get padding" into jb-dev
* commit 'd65b23089c90edcf2808ccccf8f918b6155cc2ec': Use public API to get padding
-rw-r--r--src/com/android/launcher2/CellLayout.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 2772d5c66..c2797be35 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -976,8 +976,8 @@ public class CellLayout extends ViewGroup {
int numHeightGaps = mCountY - 1;
if (mOriginalWidthGap < 0 || mOriginalHeightGap < 0) {
- int hSpace = widthSpecSize - mPaddingLeft - mPaddingRight;
- int vSpace = heightSpecSize - mPaddingTop - mPaddingBottom;
+ int hSpace = widthSpecSize - getPaddingLeft() - getPaddingRight();
+ int vSpace = heightSpecSize - getPaddingTop() - getPaddingBottom();
int hFreeSpace = hSpace - (mCountX * mCellWidth);
int vFreeSpace = vSpace - (mCountY * mCellHeight);
mWidthGap = Math.min(mMaxGap, numWidthGaps > 0 ? (hFreeSpace / numWidthGaps) : 0);