diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-15 02:21:59 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-15 02:22:00 +0000 |
commit | a8a4546805876fe18e95917f6faa13caaa4eae2f (patch) | |
tree | da4eeedd50d9faeb8442effd031d8f92e4347862 /src/com/android/launcher3/PagedView.java | |
parent | b2751ba5247e026049a38131c6c7d67ee826c8aa (diff) | |
parent | 22fc63ee298335b5f5c603ea1b77dc0e6180b16a (diff) | |
download | android_packages_apps_Trebuchet-a8a4546805876fe18e95917f6faa13caaa4eae2f.tar.gz android_packages_apps_Trebuchet-a8a4546805876fe18e95917f6faa13caaa4eae2f.tar.bz2 android_packages_apps_Trebuchet-a8a4546805876fe18e95917f6faa13caaa4eae2f.zip |
Merge "Adding padding to the folder content" into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 2ed490bf2..554a975e7 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -912,7 +912,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc pageGap = getPaddingRight(); } - childLeft += childWidth + pageGap; + childLeft += childWidth + pageGap + + (lp.isFullScreenPage ? 0 : (getPaddingLeft() + getPaddingRight())); } } |