summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/CellLayout.java
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2017-07-13 16:18:56 -0700
committerJon Miranda <jonmiranda@google.com>2017-07-13 18:40:48 -0700
commit28032006970703240f4abd34429608abd2358645 (patch)
tree86b9aab0cfcce2545e74bcc4a393ebe450f9dff4 /src/com/android/launcher3/CellLayout.java
parent8701cd58cf3b32c9d2b9269e3956b32f4726a81a (diff)
downloadpackages_apps_Trebuchet-28032006970703240f4abd34429608abd2358645.tar.gz
packages_apps_Trebuchet-28032006970703240f4abd34429608abd2358645.tar.bz2
packages_apps_Trebuchet-28032006970703240f4abd34429608abd2358645.zip
Set edgeMarginPx back to 8dp.
With the new grid changes, it was set to 16dp but this caused an issue where the workspace page spacing was too large. To "restore" the original page spacing we set it back to 8dp. This caused an issue where the pages began to overlap. This CL changes the edgeMarginPx back to 8dp, and then adds the additional 8dp to the padding of the CellLayout. Bug: 63590728 Change-Id: Ie968d8bd81de19c726f73581d6609e3bc486c5ca
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
-rw-r--r--src/com/android/launcher3/CellLayout.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 42b64ea83..aac80052e 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -860,10 +860,10 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
// Expand the background drawing bounds by the padding baked into the background drawable
mBackground.getPadding(mTempRect);
mBackground.setBounds(
- left - mTempRect.left,
- top - mTempRect.top,
- right + mTempRect.right,
- bottom + mTempRect.bottom);
+ left - mTempRect.left - getPaddingLeft(),
+ top - mTempRect.top - getPaddingTop(),
+ right + mTempRect.right + getPaddingRight(),
+ bottom + mTempRect.bottom + getPaddingBottom());
}
/**