Trebuchet : Fix insets for panelsstaging/catchup

Change-Id: I001a3c87ef2226f6a241b9538c0157b310961978

1 files changed, 12 insertions, 2 deletions

diff --git a/src/com/android/launcher3/InsettableFrameLayout.java b/src/com/android/launcher3/InsettableFrameLayout.java
index 7343bf686..6400a0f89 100644
--- a/src/com/android/launcher3/InsettableFrameLayout.java
+++ b/src/com/android/launcher3/InsettableFrameLayout.java
@@ -24,10 +24,14 @@ public class InsettableFrameLayout extends FrameLayout implements
         if (child instanceof Insettable) {
             ((Insettable) child).setInsets(newInsets);
         } else if (!lp.ignoreInsets) {
-            lp.topMargin += (newInsets.top - oldInsets.top);
+            if (!lp.ignoreTopInsets) {
+                lp.topMargin += (newInsets.top - oldInsets.top);
+            }
             lp.leftMargin += (newInsets.left - oldInsets.left);
             lp.rightMargin += (newInsets.right - oldInsets.right);
-            lp.bottomMargin += (newInsets.bottom - oldInsets.bottom);
+            if (!lp.ignoreBottomInsets) {
+                lp.bottomMargin += (newInsets.bottom - oldInsets.bottom);
+            }
         }
         child.setLayoutParams(lp);
     }
@@ -65,6 +69,8 @@ public class InsettableFrameLayout extends FrameLayout implements
 
     public static class LayoutParams extends FrameLayout.LayoutParams {
         boolean ignoreInsets = false;
+        boolean ignoreTopInsets = false;
+        boolean ignoreBottomInsets = false;
 
         public LayoutParams(Context c, AttributeSet attrs) {
             super(c, attrs);
@@ -72,6 +78,10 @@ public class InsettableFrameLayout extends FrameLayout implements
                     R.styleable.InsettableFrameLayout_Layout);
             ignoreInsets = a.getBoolean(
                     R.styleable.InsettableFrameLayout_Layout_layout_ignoreInsets, false);
+            ignoreTopInsets = a.getBoolean(
+                    R.styleable.InsettableFrameLayout_Layout_layout_ignoreTopInsets, false);
+            ignoreBottomInsets = a.getBoolean(
+                    R.styleable.InsettableFrameLayout_Layout_layout_ignoreBottomInsets, false);
             a.recycle();
         }