PagedView: Transition Effects

Conflicts:
	res/layout/overview_panel.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/values/dimens.xml
	res/values/preferences_defaults.xml
	src/com/android/launcher3/AppsCustomizePagedView.java
	src/com/android/launcher3/Launcher.java
	src/com/android/launcher3/PagedView.java
	src/com/android/launcher3/Workspace.java
	src/com/android/launcher3/settings/SettingsProvider.java

Change-Id: Ib134705952877165c334181548d577b3dceece68

1 files changed, 9 insertions, 9 deletions

diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java
index e751b079d..4b40f4bb7 100644
--- a/src/com/android/launcher3/DragLayer.java
+++ b/src/com/android/launcher3/DragLayer.java
@@ -36,6 +36,7 @@ import android.view.accessibility.AccessibilityManager;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import java.util.ArrayList;
@@ -126,11 +127,17 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
         final int n = getChildCount();
         for (int i = 0; i < n; i++) {
             final View child = getChildAt(i);
-            setInsets(child, insets, mInsets);
-            final FrameLayout.LayoutParams flp = (FrameLayout.LayoutParams) child.getLayoutParams();
             if (child.getId() == R.id.overview_panel) {
+                LinearLayout layout = (LinearLayout)
+                        child.findViewById(R.id.settings_container);
+                FrameLayout.LayoutParams lp =
+                        (FrameLayout.LayoutParams) layout.getLayoutParams();
+                lp.bottomMargin += insets.bottom - mInsets.bottom;
+                layout.setLayoutParams(lp);
                 continue;
             }
+            setInsets(child, insets, mInsets);
+            final FrameLayout.LayoutParams flp = (FrameLayout.LayoutParams) child.getLayoutParams();
             if (child instanceof Insettable) {
                 ((Insettable)child).setInsets(insets);
             } else {
@@ -895,13 +902,6 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
         invalidate();
     }
 
-    /**
-     * Note: this is a reimplementation of View.isLayoutRtl() since that is currently hidden api.
-     */
-    private boolean isLayoutRtl() {
-        return (getLayoutDirection() == LAYOUT_DIRECTION_RTL);
-    }
-
     @Override
     protected void dispatchDraw(Canvas canvas) {
         // Draw the background gradient below children.