diff options
| -rw-r--r-- | res/layout-land/launcher.xml | 2 | ||||
| -rw-r--r-- | res/layout-port/launcher.xml | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/DragLayer.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/ScrimView.java | 45 |
4 files changed, 48 insertions, 3 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 86fc1edad..77ea2e9aa 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -57,7 +57,7 @@ <!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure that it is still visible during the transition to AllApps and doesn't overlay on top of that view. --> - <FrameLayout + <com.android.launcher3.ScrimView android:id="@+id/cling_scrim" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 6638143f0..6fbf7c717 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -64,7 +64,7 @@ <!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure that it is still visible during the transition to AllApps and doesn't overlay on top of that view. --> - <FrameLayout + <com.android.launcher3.ScrimView android:id="@+id/cling_scrim" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java index 9c649edda..3c955cbe3 100644 --- a/src/com/android/launcher3/DragLayer.java +++ b/src/com/android/launcher3/DragLayer.java @@ -107,7 +107,7 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang final FrameLayout.LayoutParams flp = (FrameLayout.LayoutParams) child.getLayoutParams(); if (child instanceof Insettable) { ((Insettable)child).setInsets(insets); - } else { + } else { flp.topMargin += (insets.top - mInsets.top); flp.leftMargin += (insets.left - mInsets.left); flp.rightMargin += (insets.right - mInsets.right); diff --git a/src/com/android/launcher3/ScrimView.java b/src/com/android/launcher3/ScrimView.java new file mode 100644 index 000000000..6831fe3d4 --- /dev/null +++ b/src/com/android/launcher3/ScrimView.java @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3; + +import android.content.Context; +import android.content.res.Resources; +import android.content.res.TypedArray; +import android.graphics.Rect; +import android.util.AttributeSet; +import android.view.View; +import android.widget.FrameLayout; + +public class ScrimView extends FrameLayout implements Insettable { + + public ScrimView(Context context) { + this(context, null, 0); + } + + public ScrimView(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public ScrimView(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + } + + @Override + public void setInsets(Rect insets) { + // Do nothing + } +} |