summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/dragndrop
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2017-05-01 22:42:50 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-01 22:42:50 +0000
commitce76b9b14130f109f35a1804245afe07fef8e13b (patch)
tree6d4c787c2b90b3fb25bc096ba5f09a1f1fa5340e /src/com/android/launcher3/dragndrop
parentbdb5424fae0efb7bd2c4d148dffac5aa9ee7fc90 (diff)
parent0b728568f1a0f221bc27ac24bd0fe70f3f578177 (diff)
downloadandroid_packages_apps_Trebuchet-ce76b9b14130f109f35a1804245afe07fef8e13b.tar.gz
android_packages_apps_Trebuchet-ce76b9b14130f109f35a1804245afe07fef8e13b.tar.bz2
android_packages_apps_Trebuchet-ce76b9b14130f109f35a1804245afe07fef8e13b.zip
Merge "Remove background scrim when there are no top insets." into ub-launcher3-dorval
am: 0b728568f1 Change-Id: I8ff077c0c5761e82e5ecd3bcd363738505d7172e
Diffstat (limited to 'src/com/android/launcher3/dragndrop')
-rw-r--r--src/com/android/launcher3/dragndrop/DragLayer.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java
index 14f4e6cb6..7178c5e8d 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -449,6 +449,12 @@ public class DragLayer extends InsettableFrameLayout {
}
@Override
+ public void setInsets(Rect insets) {
+ super.setInsets(insets);
+ setBackgroundResource(insets.top == 0 ? 0 : R.drawable.workspace_bg);
+ }
+
+ @Override
public LayoutParams generateLayoutParams(AttributeSet attrs) {
return new LayoutParams(getContext(), attrs);
}