From 8b6ad0ca18654695cedc2d369b271549630d8a2d Mon Sep 17 00:00:00 2001 From: Raj Yengisetty Date: Mon, 10 Nov 2014 10:35:02 -0800 Subject: Trebuchet: Fix Insets with SearchBar Change-Id: I6a79447eeff47fab5f604e823a2210e32580e909 --- src/com/android/launcher3/DragLayer.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/com/android/launcher3/DragLayer.java') diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java index 4b40f4bb7..691b09558 100644 --- a/src/com/android/launcher3/DragLayer.java +++ b/src/com/android/launcher3/DragLayer.java @@ -137,16 +137,9 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang continue; } setInsets(child, insets, mInsets); - final FrameLayout.LayoutParams flp = (FrameLayout.LayoutParams) child.getLayoutParams(); - if (child instanceof Insettable) { - ((Insettable)child).setInsets(insets); - } else { - flp.topMargin += (insets.top - mInsets.top); - flp.leftMargin += (insets.left - mInsets.left); - flp.rightMargin += (insets.right - mInsets.right); - flp.bottomMargin += (insets.bottom - mInsets.bottom); + if (child.getId() == R.id.search_drop_target_bar) { + continue; } - child.setLayoutParams(flp); } mInsets.set(insets); return true; // I'll take it from here -- cgit v1.2.3