Home screen now shrinks while customizing
- added a shrink/fade animation on home screen when going into customization mode
- made items in the customization drawer larger
Change-Id: Iddbaf14aa5b1504fe94966971a1ab95c00f24331
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 7ca549e..16f8135 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -22,7 +22,11 @@
import android.content.Context;
import android.content.res.Resources;
import android.content.res.TypedArray;
+import android.graphics.Bitmap;
import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.drawable.Drawable;
@@ -32,6 +36,7 @@
import android.view.View;
import android.view.ViewDebug;
import android.view.ViewGroup;
+import android.view.View.OnTouchListener;
import android.view.animation.Animation;
import android.view.animation.LayoutAnimationController;
@@ -40,6 +45,8 @@
public class CellLayout extends ViewGroup {
static final String TAG = "CellLayout";
+ // we make the dimmed bitmap smaller than the screen itself for memory + perf reasons
+ static final float DIMMED_BITMAP_SCALE = 0.25f;
private boolean mPortrait;
@@ -72,6 +79,18 @@
boolean[][] mOccupied;
+ private OnTouchListener mInterceptTouchListener;
+
+ // this is what the home screen fades to when it shrinks
+ // (ie in all apps and in home screen customize mode)
+ private Bitmap mDimmedBitmap;
+ private Canvas mDimmedBitmapCanvas;
+ private float mDimmedBitmapAlpha;
+ private boolean mDimmedBitmapDirty;
+ private final Paint mDimmedBitmapPaint = new Paint();
+ private final Rect mLayoutRect = new Rect();
+ private final Rect mDimmedBitmapRect = new Rect();
+
private final RectF mDragRect = new RectF();
// When dragging, used to indicate a vacant drop location
@@ -130,6 +149,8 @@
setAlwaysDrawnWithCacheEnabled(false);
mWallpaperManager = WallpaperManager.getInstance(getContext());
+
+ mDimmedBitmapPaint.setFilterBitmap(true);
}
@Override
@@ -147,6 +168,15 @@
(int)mDragRect.bottom);
mDragRectDrawable.draw(canvas);
}
+ if (mDimmedBitmap != null && mDimmedBitmapAlpha > 0.0f) {
+ if (mDimmedBitmapDirty) {
+ updateDimmedBitmap();
+ mDimmedBitmapDirty = false;
+ }
+ mDimmedBitmapPaint.setAlpha((int) (mDimmedBitmapAlpha * 255));
+
+ canvas.drawBitmap(mDimmedBitmap, mDimmedBitmapRect, mLayoutRect, mDimmedBitmapPaint);
+ }
}
@Override
@@ -161,6 +191,10 @@
}
}
+ public void setOnInterceptTouchListener(View.OnTouchListener listener) {
+ mInterceptTouchListener = listener;
+ }
+
int getCountX() {
return mPortrait ? mShortAxisCells : mLongAxisCells;
}
@@ -183,13 +217,26 @@
child.setId(childId);
+ // We might be in the middle or end of shrinking/fading to a dimmed view
+ // Make sure this view's alpha is set the same as all the rest of the views
+ child.setAlpha(1.0f - mDimmedBitmapAlpha);
+
addView(child, index, lp);
+
+ // next time we draw the dimmed bitmap we need to update it
+ mDimmedBitmapDirty = true;
return true;
}
return false;
}
@Override
+ public void removeView(View view) {
+ super.removeView(view);
+ mDimmedBitmapDirty = true;
+ }
+
+ @Override
public void requestChildFocus(View child, View focused) {
super.requestChildFocus(child, focused);
if (child != null) {
@@ -267,6 +314,9 @@
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
+ if (mInterceptTouchListener != null && mInterceptTouchListener.onTouch(this, ev)) {
+ return true;
+ }
final int action = ev.getAction();
final CellInfo cellInfo = mCellInfo;
@@ -654,6 +704,13 @@
}
@Override
+ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+ super.onSizeChanged(w, h, oldw, oldh);
+ mLayoutRect.set(0, 0, w, h);
+ mDimmedBitmapRect.set(0, 0, (int) (DIMMED_BITMAP_SCALE * w), (int) (DIMMED_BITMAP_SCALE * h));
+ }
+
+ @Override
protected void setChildrenDrawingCacheEnabled(boolean enabled) {
final int count = getChildCount();
for (int i = 0; i < count; i++) {
@@ -669,6 +726,55 @@
super.setChildrenDrawnWithCacheEnabled(enabled);
}
+ public float getDimmedBitmapAlpha() {
+ return mDimmedBitmapAlpha;
+ }
+
+ public void setDimmedBitmapAlpha(float alpha) {
+ // If we're dimming the screen after it was not dimmed, refresh
+ // to allow for updated widgets. We don't continually refresh it
+ // after this point, however, as an optimization
+ if (mDimmedBitmapAlpha == 0.0f && alpha > 0.0f) {
+ updateDimmedBitmap();
+ }
+ mDimmedBitmapAlpha = alpha;
+ setChildrenAlpha(1.0f - mDimmedBitmapAlpha);
+ }
+
+ private void setChildrenAlpha(float alpha) {
+ for (int i = 0; i < getChildCount(); i++) {
+ getChildAt(i).setAlpha(alpha);
+ }
+ }
+
+ public void updateDimmedBitmap() {
+ if (mDimmedBitmap == null) {
+ mDimmedBitmap = Bitmap.createBitmap((int) (getWidth() * DIMMED_BITMAP_SCALE),
+ (int) (getHeight() * DIMMED_BITMAP_SCALE), Bitmap.Config.ARGB_8888);
+ mDimmedBitmapCanvas = new Canvas(mDimmedBitmap);
+ mDimmedBitmapCanvas.scale(DIMMED_BITMAP_SCALE, DIMMED_BITMAP_SCALE);
+ }
+ // clear the canvas
+ mDimmedBitmapCanvas.drawColor(0x00000000, PorterDuff.Mode.CLEAR);
+
+ // draw the screen into the bitmap
+ // just for drawing to the bitmap, make all the items on the screen opaque
+ setChildrenAlpha(1.0f);
+ dispatchDraw(mDimmedBitmapCanvas);
+ setChildrenAlpha(1.0f - mDimmedBitmapAlpha);
+
+ // make the bitmap 'dimmed' ie colored regions are dark grey,
+ // the rest is light grey
+ // We draw grey to the whole bitmap, but filter where we draw based on
+ // what regions are transparent or not (SRC_OUT), causing the intended effect
+
+ // First, draw light grey everywhere in the background (currently transparent) regions
+ // This will leave the regions with the widgets as mostly transparent
+ mDimmedBitmapCanvas.drawColor(0xCCCCCCCC, PorterDuff.Mode.SRC_OUT);
+ // Now, fill the the remaining transparent regions with dark grey
+ mDimmedBitmapCanvas.drawColor(0xCC333333, PorterDuff.Mode.SRC_OUT);
+ }
+
private boolean isVacant(int originX, int originY, int spanX, int spanY) {
for (int i = 0; i < spanY; i++) {
if (!isRowEmpty(originY + i, originX, originX + spanX - 1, mOccupied)) {
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 37e7191..be60e98 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -762,11 +762,6 @@
final Workspace workspace = mWorkspace;
workspace.setHapticFeedbackEnabled(false);
- // We only intercept touch events to dismiss the home customization drawer; if it doesn't
- // exist, then no need to do this
- if (mHomeCustomizationDrawer != null)
- workspace.setOnInterceptTouchListener(this);
-
DeleteZone deleteZone = (DeleteZone) dragLayer.findViewById(R.id.delete_zone);
mDeleteZone = deleteZone;
@@ -1036,6 +1031,7 @@
}
closeAllApps(alreadyOnHome && allAppsVisible);
hideCustomizationDrawer();
+ mWorkspace.unshrink();
final View v = getWindow().peekDecorView();
if (v != null && v.getWindowToken() != null) {
@@ -1270,6 +1266,7 @@
// Animate the widget chooser up from the bottom of the screen
if (!isCustomizationDrawerVisible()) {
showCustomizationDrawer();
+ mWorkspace.shrink();
}
} else {
showAddDialog(mMenuAddInfo);
@@ -1506,6 +1503,7 @@
closeAllApps(true);
} else if (isCustomizationDrawerVisible()) {
hideCustomizationDrawer();
+ mWorkspace.unshrink();
} else {
closeFolder();
}
@@ -1580,9 +1578,10 @@
}
public boolean onTouch(View v, MotionEvent event) {
- // this is being forwarded from mWorkspace;
+ // this is an intercepted event being forwarded from mWorkspace;
// clicking anywhere on the workspace causes the drawer to slide down
hideCustomizationDrawer();
+ mWorkspace.unshrink();
return false;
}
@@ -2129,7 +2128,7 @@
mHomeCustomizationDrawer.startAnimation(AnimationUtils.loadAnimation(this, R.anim.home_customization_drawer_slide_up));
}
- private void hideCustomizationDrawer() {
+ void hideCustomizationDrawer() {
if (isCustomizationDrawerVisible()) {
Animation slideDownAnimation = AnimationUtils.loadAnimation(this, R.anim.home_customization_drawer_slide_down);
slideDownAnimation.setAnimationListener(new Animation.AnimationListener() {
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 79fb4a9..7fbdd1e 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -17,7 +17,12 @@
package com.android.launcher2;
import com.android.launcher.R;
+import com.android.launcher2.CellLayout.LayoutParams;
+import android.animation.Animatable;
+import android.animation.PropertyAnimator;
+import android.animation.Sequencer;
+import android.animation.Animatable.AnimatableListener;
import android.app.WallpaperManager;
import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetProviderInfo;
@@ -41,12 +46,14 @@
import android.view.VelocityTracker;
import android.view.View;
import android.view.ViewConfiguration;
+import android.view.ViewDebug;
import android.view.ViewGroup;
import android.view.ViewParent;
import android.view.animation.Animation;
-import android.view.animation.Animation.AnimationListener;
+import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;
import android.view.animation.RotateAnimation;
+import android.view.animation.Animation.AnimationListener;
import android.widget.Scroller;
import android.widget.TextView;
import android.widget.Toast;
@@ -59,10 +66,14 @@
* Each screen contains a number of icons, folders or widgets the user can
* interact with. A workspace is meant to be used with a fixed width only.
*/
-public class Workspace extends ViewGroup implements DropTarget, DragSource, DragScroller {
+public class Workspace extends ViewGroup
+ implements DropTarget, DragSource, DragScroller, View.OnTouchListener {
@SuppressWarnings({"UnusedDeclaration"})
private static final String TAG = "Launcher.Workspace";
private static final int INVALID_SCREEN = -1;
+ // This is how much the workspace shrinks when we enter all apps or
+ // customization mode
+ private static final float SHRINK_FACTOR = 0.16f;
/**
* The velocity at which a fling gesture will cause us to snap to the next
@@ -104,7 +115,6 @@
private int mTouchState = TOUCH_STATE_REST;
- private OnTouchListener mInterceptTouchListener;
private OnLongClickListener mLongClickListener;
private Launcher mLauncher;
@@ -144,6 +154,11 @@
private Paint mDropIndicatorPaint;
+ // State variable that indicated whether the screens are small (ie when you're
+ // in all apps or customize mode)
+ private boolean mIsSmall;
+ private AnimatableListener mUnshrinkAnimationListener;
+
private static class WorkspaceOvershootInterpolator implements Interpolator {
private static final float DEFAULT_TENSION = 1.3f;
private float mTension;
@@ -218,6 +233,14 @@
final ViewConfiguration configuration = ViewConfiguration.get(getContext());
mTouchSlop = configuration.getScaledTouchSlop();
mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
+ mUnshrinkAnimationListener = new AnimatableListener() {
+ public void onAnimationStart(Animatable animation) {}
+ public void onAnimationEnd(Animatable animation) {
+ mIsSmall = false;
+ }
+ public void onAnimationCancel(Animatable animation) {}
+ public void onAnimationRepeat(Animatable animation) {}
+ };
}
@Override
@@ -278,10 +301,10 @@
}
ArrayList<Folder> getOpenFolders() {
- final int screens = getChildCount();
- ArrayList<Folder> folders = new ArrayList<Folder>(screens);
+ final int screenCount = getChildCount();
+ ArrayList<Folder> folders = new ArrayList<Folder>(screenCount);
- for (int screen = 0; screen < screens; screen++) {
+ for (int screen = 0; screen < screenCount; screen++) {
CellLayout currentScreen = (CellLayout) getChildAt(screen);
int count = currentScreen.getChildCount();
for (int i = 0; i < count; i++) {
@@ -425,7 +448,7 @@
}
public void refreshWorkspaceChildren() {
- final int count = getChildCount();
+ final int screenCount = getChildCount();
View child;
CellLayout.LayoutParams lp;
@@ -436,12 +459,12 @@
clearVacantCache();
- for (int i = 0; i < count; i++) {
+ for (int i = 0; i < screenCount; i++) {
final CellLayout layout = (CellLayout) getChildAt(i);
- int numChildren = layout.getChildCount();
+ final int count = layout.getChildCount();
// save reference to all current children
- for (int j = 0; j < numChildren; j++) {
+ for (int j = 0; j < count; j++) {
child = layout.getChildAt(j);
lp = (CellLayout.LayoutParams) child.getLayoutParams();
@@ -521,8 +544,13 @@
}
}
- public void setOnInterceptTouchListener(View.OnTouchListener listener) {
- mInterceptTouchListener = listener;
+ public boolean onTouch(View v, MotionEvent event) {
+ // this is an intercepted event being forwarded from a cell layout
+ if (mIsSmall) {
+ unshrink((CellLayout)v);
+ mLauncher.hideCustomizationDrawer();
+ }
+ return false;
}
/**
@@ -533,8 +561,8 @@
@Override
public void setOnLongClickListener(OnLongClickListener l) {
mLongClickListener = l;
- final int count = getChildCount();
- for (int i = 0; i < count; i++) {
+ final int screenCount = getChildCount();
+ for (int i = 0; i < screenCount; i++) {
getChildAt(i).setOnLongClickListener(l);
}
}
@@ -602,8 +630,17 @@
// the drawing dispatch by drawing only what we know needs to be drawn.
boolean fastDraw = mTouchState != TOUCH_STATE_SCROLLING && mNextScreen == INVALID_SCREEN;
- // If we are not scrolling or flinging, draw only the current screen
- if (fastDraw) {
+
+ // if the screens are all small, we need to draw all the screens since
+ // they're most likely all visible
+ if (mIsSmall) {
+ final int screenCount = getChildCount();
+ for (int i = 0; i < screenCount; i++) {
+ CellLayout cl = (CellLayout)getChildAt(i);
+ drawChild(canvas, cl, getDrawingTime());
+ }
+ } else if (fastDraw) {
+ // If we are not scrolling or flinging, draw only the current screen
drawChild(canvas, getChildAt(mCurrentScreen), getDrawingTime());
} else {
final long drawingTime = getDrawingTime();
@@ -645,8 +682,8 @@
}
// The children are given the same width and height as the workspace
- final int count = getChildCount();
- for (int i = 0; i < count; i++) {
+ final int screenCount = getChildCount();
+ for (int i = 0; i < screenCount; i++) {
getChildAt(i).measure(widthMeasureSpec, heightMeasureSpec);
}
@@ -655,21 +692,26 @@
scrollTo(mCurrentScreen * width, 0);
setHorizontalScrollBarEnabled(true);
updateWallpaperOffset(width * (getChildCount() - 1));
- mFirstLayout = false;
}
}
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
- int childLeft = 0;
+ final int screenCount = getChildCount();
+ if (mFirstLayout) {
+ final int width = getWidth();
+ for (int i = 0; i < screenCount; i++) {
+ getChildAt(i).setX(i*width);
+ }
+ mFirstLayout = false;
+ }
- final int count = getChildCount();
- for (int i = 0; i < count; i++) {
+ for (int i = 0; i < screenCount; i++) {
final View child = getChildAt(i);
if (child.getVisibility() != View.GONE) {
- final int childWidth = child.getMeasuredWidth();
- child.layout(childLeft, 0, childLeft + childWidth, child.getMeasuredHeight());
- childLeft += childWidth;
+ final int childX = child.getX();
+ child.layout(
+ childX, 0, childX + child.getMeasuredWidth(), child.getMeasuredHeight());
}
}
@@ -760,9 +802,6 @@
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
- if (mInterceptTouchListener != null && mInterceptTouchListener.onTouch(this, ev)) {
- return true;
- }
final boolean workspaceLocked = mLauncher.isWorkspaceLocked();
final boolean allAppsVisible = mLauncher.isAllAppsVisible();
if (workspaceLocked || allAppsVisible) {
@@ -946,10 +985,10 @@
toScreen = temp;
}
- final int count = getChildCount();
+ final int screenCount = getChildCount();
fromScreen = Math.max(fromScreen, 0);
- toScreen = Math.min(toScreen, count - 1);
+ toScreen = Math.min(toScreen, screenCount - 1);
for (int i = fromScreen; i <= toScreen; i++) {
final CellLayout layout = (CellLayout) getChildAt(i);
@@ -959,8 +998,8 @@
}
void clearChildrenCache() {
- final int count = getChildCount();
- for (int i = 0; i < count; i++) {
+ final int screenCount = getChildCount();
+ for (int i = 0; i < screenCount; i++) {
final CellLayout layout = (CellLayout) getChildAt(i);
layout.setChildrenDrawnWithCacheEnabled(false);
}
@@ -1078,6 +1117,87 @@
return true;
}
+ // we use this to shrink the workspace for the all apps view and the customize view
+ void shrink() {
+ mIsSmall = true;
+ final int screenWidth = getWidth();
+
+ final int scaledWorkspacePageWidth = (int)(SHRINK_FACTOR*screenWidth);
+ final float scaledSpacing = getResources().getDimension(R.dimen.smallScreenSpacing);
+
+ final int screenCount = getChildCount();
+ float totalWidth = screenCount * scaledWorkspacePageWidth + (screenCount - 1) * scaledSpacing;
+
+ // We animate all the screens to the centered position in workspace
+ // At the same time, the screens become greyed/dimmed
+
+ // newX is initialized to the left-most position of the centered screens
+ float newX = (mCurrentScreen + 1) * screenWidth - screenWidth / 2 - totalWidth / 2;
+ Sequencer s = new Sequencer();
+ for (int i = 0; i < screenCount; i++) {
+ CellLayout cl = (CellLayout) getChildAt(i);
+ PropertyAnimator translate = new PropertyAnimator(
+ 500, cl, "x", cl.getX(), (int) newX);
+ PropertyAnimator scaleX = new PropertyAnimator(
+ 500, cl, "scaleX", cl.getScaleX(), SHRINK_FACTOR);
+ PropertyAnimator scaleY = new PropertyAnimator(
+ 500, cl, "scaleY", cl.getScaleY(), SHRINK_FACTOR);
+ PropertyAnimator alpha = new PropertyAnimator(
+ 500, cl, "dimmedBitmapAlpha", cl.getDimmedBitmapAlpha(), 1.0f);
+ Sequencer.Builder b = s.play(translate);
+ b.with(scaleX);
+ b.with(scaleY);
+ b.with(alpha);
+ // increment newX for the next screen
+ newX += scaledWorkspacePageWidth + scaledSpacing;
+ cl.setOnInterceptTouchListener(this);
+ }
+ setChildrenDrawnWithCacheEnabled(true);
+ s.start();
+ }
+
+ // We call this when we trigger an unshrink by clicking on the CellLayout cl
+ private void unshrink(CellLayout clThatWasClicked) {
+ int newCurrentScreen = mCurrentScreen;
+ final int screenCount = getChildCount();
+ for (int i = 0; i < screenCount; i++) {
+ if (getChildAt(i) == clThatWasClicked) {
+ newCurrentScreen = i;
+ }
+ }
+ final int delta = (newCurrentScreen - mCurrentScreen)*getWidth();
+ for (int i = 0; i < screenCount; i++) {
+ CellLayout cl = (CellLayout) getChildAt(i);
+ cl.setX(cl.getX() + delta);
+ }
+ mScrollX = newCurrentScreen * getWidth();
+
+ unshrink();
+ setCurrentScreen(newCurrentScreen);
+ }
+
+ public void unshrink() {
+ final int screenWidth = getWidth();
+ Sequencer s = new Sequencer();
+ final int screenCount = getChildCount();
+ for (int i = 0; i < screenCount; i++) {
+ CellLayout cl = (CellLayout)getChildAt(i);
+ int x = screenWidth * i;
+
+ PropertyAnimator translate = new PropertyAnimator(500, cl, "x", cl.getX(), x);
+ PropertyAnimator scaleX = new PropertyAnimator(500, cl, "scaleX", cl.getScaleX(), 1.0f);
+ PropertyAnimator scaleY = new PropertyAnimator(500, cl, "scaleY", cl.getScaleY(), 1.0f);
+ PropertyAnimator alpha = new PropertyAnimator(
+ 500, cl, "dimmedBitmapAlpha", cl.getDimmedBitmapAlpha(), 0.0f);
+ Sequencer.Builder b = s.play(translate);
+ b.with(scaleX);
+ b.with(scaleY);
+ b.with(alpha);
+ }
+ s.addListener(mUnshrinkAnimationListener);
+ s.start();
+ }
+
void snapToScreen(int whichScreen) {
snapToScreen(whichScreen, 0, false);
}
@@ -1493,8 +1613,8 @@
int result = -1;
if (v != null) {
ViewParent vp = v.getParent();
- int count = getChildCount();
- for (int i = 0; i < count; i++) {
+ final int screenCount = getChildCount();
+ for (int i = 0; i < screenCount; i++) {
if (vp == getChildAt(i)) {
return i;
}
@@ -1504,7 +1624,7 @@
}
public Folder getFolderForTag(Object tag) {
- int screenCount = getChildCount();
+ final int screenCount = getChildCount();
for (int screen = 0; screen < screenCount; screen++) {
CellLayout currentScreen = ((CellLayout) getChildAt(screen));
int count = currentScreen.getChildCount();
@@ -1553,7 +1673,7 @@
}
void removeItems(final ArrayList<ApplicationInfo> apps) {
- final int count = getChildCount();
+ final int screenCount = getChildCount();
final PackageManager manager = getContext().getPackageManager();
final AppWidgetManager widgets = AppWidgetManager.getInstance(getContext());
@@ -1563,7 +1683,7 @@
packageNames.add(apps.get(i).componentName.getPackageName());
}
- for (int i = 0; i < count; i++) {
+ for (int i = 0; i < screenCount; i++) {
final CellLayout layout = (CellLayout) getChildAt(i);
// Avoid ANRs by treating each screen separately
@@ -1674,8 +1794,8 @@
void updateShortcuts(ArrayList<ApplicationInfo> apps) {
final PackageManager pm = mLauncher.getPackageManager();
- final int count = getChildCount();
- for (int i = 0; i < count; i++) {
+ final int screenCount = getChildCount();
+ for (int i = 0; i < screenCount; i++) {
final CellLayout layout = (CellLayout) getChildAt(i);
int childCount = layout.getChildCount();
for (int j = 0; j < childCount; j++) {