diff options
Diffstat (limited to 'src/com/android')
4 files changed, 119 insertions, 8 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(); } diff --git a/src/com/android/launcher3/InsettableLinearLayout.java b/src/com/android/launcher3/InsettableLinearLayout.java new file mode 100644 index 000000000..c48c088cc --- /dev/null +++ b/src/com/android/launcher3/InsettableLinearLayout.java @@ -0,0 +1,106 @@ +package com.android.launcher3; + +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Rect; +import android.util.AttributeSet; +import android.view.View; +import android.view.ViewGroup; +import android.widget.LinearLayout; + +public class InsettableLinearLayout extends LinearLayout implements + ViewGroup.OnHierarchyChangeListener, Insettable { + + protected Rect mInsets = new Rect(); + + public InsettableLinearLayout(Context context, AttributeSet attrs) { + super(context, attrs); + setOnHierarchyChangeListener(this); + } + + public void setLinearLayoutChildInsets(View child, Rect newInsets, Rect oldInsets) { + final LayoutParams lp = (LayoutParams) child.getLayoutParams(); + + if (child instanceof Insettable) { + ((Insettable) child).setInsets(newInsets); + } else if (!lp.ignoreInsets) { + if (!lp.ignoreTopInsets) { + lp.topMargin += (newInsets.top - oldInsets.top); + } + lp.leftMargin += (newInsets.left - oldInsets.left); + lp.rightMargin += (newInsets.right - oldInsets.right); + if (!lp.ignoreBottomInsets) { + lp.bottomMargin += (newInsets.bottom - oldInsets.bottom); + } + } + child.setLayoutParams(lp); + } + + @Override + public void setInsets(Rect insets) { + final int n = getChildCount(); + for (int i = 0; i < n; i++) { + final View child = getChildAt(i); + setLinearLayoutChildInsets(child, insets, mInsets); + } + mInsets.set(insets); + } + + @Override + public LayoutParams generateLayoutParams(AttributeSet attrs) { + return new InsettableLinearLayout.LayoutParams(getContext(), attrs); + } + + @Override + protected LayoutParams generateDefaultLayoutParams() { + return new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); + } + + // Override to allow type-checking of LayoutParams. + @Override + protected boolean checkLayoutParams(ViewGroup.LayoutParams p) { + return p instanceof InsettableLinearLayout.LayoutParams; + } + + @Override + protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) { + return new LayoutParams(p); + } + + public static class LayoutParams extends LinearLayout.LayoutParams { + boolean ignoreInsets = false; + boolean ignoreTopInsets = false; + boolean ignoreBottomInsets = false; + + public LayoutParams(Context c, AttributeSet attrs) { + super(c, attrs); + TypedArray a = c.obtainStyledAttributes(attrs, + R.styleable.InsettableLinearLayout_Layout); + ignoreInsets = a.getBoolean( + R.styleable.InsettableLinearLayout_Layout_layout_ignoreInsets, false); + ignoreTopInsets = a.getBoolean( + R.styleable.InsettableLinearLayout_Layout_layout_ignoreTopInsets, false); + ignoreBottomInsets = a.getBoolean( + R.styleable.InsettableLinearLayout_Layout_layout_ignoreBottomInsets, false); + a.recycle(); + } + + public LayoutParams(int width, int height) { + super(width, height); + } + + public LayoutParams(ViewGroup.LayoutParams lp) { + super(lp); + } + } + + @Override + public void onChildViewAdded(View parent, View child) { + setLinearLayoutChildInsets(child, mInsets, new Rect()); + } + + @Override + public void onChildViewRemoved(View parent, View child) { + } + +} diff --git a/src/com/android/launcher3/OverviewPanel.java b/src/com/android/launcher3/OverviewPanel.java index 83603d814..d7f20d38c 100644 --- a/src/com/android/launcher3/OverviewPanel.java +++ b/src/com/android/launcher3/OverviewPanel.java @@ -27,7 +27,7 @@ public class OverviewPanel extends SlidingUpPanelLayout implements Insettable { findViewById(R.id.settings_container); FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) layout.getLayoutParams(); - lp.bottomMargin += insets.bottom - insets.bottom; + lp.bottomMargin = insets.bottom; layout.setLayoutParams(lp); } } diff --git a/src/com/android/launcher3/TransitionEffectsFragment.java b/src/com/android/launcher3/TransitionEffectsFragment.java index 22b6df735..6c5542b0b 100644 --- a/src/com/android/launcher3/TransitionEffectsFragment.java +++ b/src/com/android/launcher3/TransitionEffectsFragment.java @@ -74,11 +74,6 @@ public class TransitionEffectsFragment extends Fragment { mListView = (ListView) v.findViewById(R.id.settings_transitions_list); final Launcher launcher = (Launcher) getActivity(); - LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) - mListView.getLayoutParams(); - lp.bottomMargin = ((FrameLayout.LayoutParams) launcher.getOverviewPanel() - .findViewById(R.id.settings_container).getLayoutParams()).bottomMargin; - mListView.setLayoutParams(lp); mIsDrawer = getArguments().getBoolean(PAGE_OR_DRAWER_SCROLL_SELECT); |