summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/PagedView.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-08-03 17:06:35 -0700
committerWinson Chung <winsonc@google.com>2011-08-04 15:50:30 -0700
commitea359c6aee44c0fe3bb94f7002c3b49208b32b7f (patch)
treed8fc92f2dd3eff26415b0bc8855f7714f819bc1a /src/com/android/launcher2/PagedView.java
parent459814b7e6d6c9bb6b0569dcedb455f6fab3aa9c (diff)
downloadandroid_packages_apps_Trebuchet-ea359c6aee44c0fe3bb94f7002c3b49208b32b7f.tar.gz
android_packages_apps_Trebuchet-ea359c6aee44c0fe3bb94f7002c3b49208b32b7f.tar.bz2
android_packages_apps_Trebuchet-ea359c6aee44c0fe3bb94f7002c3b49208b32b7f.zip
Grid spacing fixes
- Restoring old grid for widgets - Disabling ability to add widgets to hotseat - Updating holo colors - Updating assets Change-Id: I3a639f0afeca9463f8079eb8fbaedf295a41fa0f
Diffstat (limited to 'src/com/android/launcher2/PagedView.java')
-rw-r--r--src/com/android/launcher2/PagedView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 48360feb1..24feb4148 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -432,6 +432,7 @@ public abstract class PagedView extends ViewGroup {
int maxChildHeight = 0;
final int verticalPadding = mPaddingTop + mPaddingBottom;
+ final int horizontalPadding = mPaddingLeft + mPaddingRight;
// The children are given the same width and height as the workspace
@@ -458,7 +459,7 @@ public abstract class PagedView extends ViewGroup {
}
final int childWidthMeasureSpec =
- MeasureSpec.makeMeasureSpec(widthSize, childWidthMode);
+ MeasureSpec.makeMeasureSpec(widthSize - horizontalPadding, childWidthMode);
final int childHeightMeasureSpec =
MeasureSpec.makeMeasureSpec(heightSize - verticalPadding, childHeightMode);