Merge branch 'master' into honeycomb-release
* master:
Making the customization drawer a little smaller.
holo look for pressed/focused workspace icons
Fixing drawing order issue in bg gradient
fix potential leak of Activities
diff --git a/res/drawable/shortcut_selector.xml b/res/drawable/shortcut_selector.xml
deleted file mode 100644
index 8059f00..0000000
--- a/res/drawable/shortcut_selector.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, 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.
-*/
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_window_focused="true" android:state_focused="true" android:drawable="@drawable/focused_application_background" />
- <item android:state_pressed="true" android:drawable="@drawable/pressed_application_background" />
- <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/res/layout-xlarge-land/customization_drawer.xml b/res/layout-xlarge-land/customization_drawer.xml
index 9d088f2..50e7b66 100644
--- a/res/layout-xlarge-land/customization_drawer.xml
+++ b/res/layout-xlarge-land/customization_drawer.xml
@@ -21,7 +21,7 @@
android:layout_height="match_parent"
launcher:wallpaperCellSpanX="3"
launcher:wallpaperCellCountX="12"
- launcher:widgetCellCountX="16"
+ launcher:widgetCellCountX="14"
launcher:cellCountX="8"
launcher:cellCountY="3"
launcher:pageLayoutWidthGap="32dp"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 57f8bfc..4abbd50 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -33,4 +33,9 @@
<color name="dimmed_view_color">#FF7F7F7F</color>
<color name="drag_outline_color">#9DBE12</color>
+
+ <color name="workspace_item_pressed_outline_color">#6595f9</color>
+ <color name="workspace_item_pressed_glow_color">#0997ff</color>
+ <color name="workspace_item_focused_outline_color">#6595f9</color>
+ <color name="workspace_item_focused_glow_color">#0997ff</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1e2dba2..7592a15 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -44,7 +44,6 @@
<item name="android:gravity">center_horizontal</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
- <item name="android:background">@drawable/shortcut_selector</item>
<item name="android:paddingLeft">5dip</item>
<item name="android:paddingRight">5dip</item>
</style>
diff --git a/src/com/android/launcher2/ApplicationInfoDropTarget.java b/src/com/android/launcher2/ApplicationInfoDropTarget.java
index 849d2b5..fdcbbd4 100644
--- a/src/com/android/launcher2/ApplicationInfoDropTarget.java
+++ b/src/com/android/launcher2/ApplicationInfoDropTarget.java
@@ -16,15 +16,14 @@
package com.android.launcher2;
+import android.animation.Animator;
+import android.animation.Animator.AnimatorListener;
+import android.animation.ObjectAnimator;
import android.content.ComponentName;
import android.content.Context;
-import android.graphics.Paint;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
-import android.graphics.Rect;
import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ImageView;
import com.android.launcher.R;
@@ -32,21 +31,12 @@
* Implements a DropTarget which allows applications to be dropped on it,
* in order to launch the application info for that app.
*/
-public class ApplicationInfoDropTarget extends ImageView implements DropTarget, DragController.DragListener {
- private Launcher mLauncher;
- private boolean mActive = false;
+public class ApplicationInfoDropTarget extends IconDropTarget {
+ private static final int sFadeInAnimationDuration = 200;
+ private static final int sFadeOutAnimationDuration = 100;
- /**
- * If true, this View responsible for managing its own visibility, and that of its handle.
- * This is generally the case, but it will be set to false when this is part of the
- * Contextual Action Bar.
- */
- private boolean mDragAndDropEnabled = true;
-
- /** The view that this view should appear in the place of. */
- private View mHandle = null;
-
- private final Paint mPaint = new Paint();
+ private ObjectAnimator mFadeAnimator;
+ private ObjectAnimator mHandleFadeAnimator;
public ApplicationInfoDropTarget(Context context, AttributeSet attrs) {
this(context, attrs, 0);
@@ -54,13 +44,10 @@
public ApplicationInfoDropTarget(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
- }
- /**
- * Set the color that will be used as a filter over objects dragged over this object.
- */
- public void setDragColor(int color) {
- mPaint.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP));
+ // Set the hover paint colour
+ int colour = getContext().getResources().getColor(R.color.app_info_filter);
+ mHoverPaint.setColorFilter(new PorterDuffColorFilter(colour, PorterDuff.Mode.SRC_ATOP));
}
public boolean acceptDrop(DragSource source, int x, int y, int xOffset, int yOffset,
@@ -81,19 +68,10 @@
return false;
}
- public void onDrop(DragSource source, int x, int y, int xOffset, int yOffset,
- DragView dragView, Object dragInfo) {
-
- }
-
public void onDragEnter(DragSource source, int x, int y, int xOffset, int yOffset,
DragView dragView, Object dragInfo) {
if (!mDragAndDropEnabled) return;
- dragView.setPaint(mPaint);
- }
-
- public void onDragOver(DragSource source, int x, int y, int xOffset, int yOffset,
- DragView dragView, Object dragInfo) {
+ dragView.setPaint(mHoverPaint);
}
public void onDragExit(DragSource source, int x, int y, int xOffset, int yOffset,
@@ -106,63 +84,70 @@
if (info != null && mDragAndDropEnabled) {
final int itemType = ((ItemInfo)info).itemType;
mActive = (itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION);
-
- // Only show the info icon when an application is selected
if (mActive) {
+ // Fade in this icon
+ if (mFadeAnimator != null) mFadeAnimator.cancel();
+ mFadeAnimator = ObjectAnimator.ofFloat(this, "alpha", 0.0f, 1.0f);
+ mFadeAnimator.setDuration(sFadeInAnimationDuration);
+ mFadeAnimator.start();
setVisibility(VISIBLE);
- }
- if (mHandle != null) {
- mHandle.setVisibility(INVISIBLE);
+
+ // Fade out the handle
+ if (mHandle != null) {
+ if (mHandleFadeAnimator != null) mHandleFadeAnimator.cancel();
+ mHandleFadeAnimator = ObjectAnimator.ofFloat(mHandle, "alpha", 0.0f);
+ mHandleFadeAnimator.setDuration(sFadeOutAnimationDuration);
+ mHandleFadeAnimator.addListener(new AnimatorListener() {
+ public void onAnimationStart(Animator animation) {}
+ public void onAnimationRepeat(Animator animation) {}
+ public void onAnimationEnd(Animator animation) {
+ onEndOrCancel();
+ }
+ public void onAnimationCancel(Animator animation) {
+ onEndOrCancel();
+ }
+ private void onEndOrCancel() {
+ mHandle.setVisibility(INVISIBLE);
+ mHandleFadeAnimator = null;
+ }
+ });
+ mHandleFadeAnimator.start();
+ }
}
}
}
- public boolean isDropEnabled() {
- return mActive;
- }
-
public void onDragEnd() {
if (!mDragAndDropEnabled) return;
+ if (mActive) mActive = false;
- if (mActive) {
- mActive = false;
- }
- setVisibility(GONE);
+ // Fade out this icon
+ if (mFadeAnimator != null) mFadeAnimator.cancel();
+ mFadeAnimator = ObjectAnimator.ofFloat(this, "alpha", 0.0f);
+ mFadeAnimator.setDuration(sFadeOutAnimationDuration);
+ mFadeAnimator.addListener(new AnimatorListener() {
+ public void onAnimationStart(Animator animation) {}
+ public void onAnimationRepeat(Animator animation) {}
+ public void onAnimationEnd(Animator animation) {
+ onEndOrCancel();
+ }
+ public void onAnimationCancel(Animator animation) {
+ onEndOrCancel();
+ }
+ private void onEndOrCancel() {
+ setVisibility(GONE);
+ mFadeAnimator = null;
+ }
+ });
+ mFadeAnimator.start();
+
+ // Fade in the handle
if (mHandle != null) {
+ if (mHandleFadeAnimator != null) mHandleFadeAnimator.cancel();
+ mHandleFadeAnimator = ObjectAnimator.ofFloat(mHandle, "alpha", 1.0f);
+ mHandleFadeAnimator.setDuration(sFadeInAnimationDuration);
+ mHandleFadeAnimator.start();
mHandle.setVisibility(VISIBLE);
}
}
-
- @Override
- public void getHitRect(Rect outRect) {
- super.getHitRect(outRect);
- if (LauncherApplication.isScreenXLarge()) {
- final int padding = R.dimen.delete_zone_padding;
- final int outerDragPadding =
- getResources().getDimensionPixelSize(R.dimen.delete_zone_size);
- final int innerDragPadding = getResources().getDimensionPixelSize(padding);
- outRect.top -= outerDragPadding;
- outRect.left -= innerDragPadding;
- outRect.bottom += outerDragPadding;
- outRect.right += outerDragPadding;
- }
- }
-
- void setLauncher(Launcher launcher) {
- mLauncher = launcher;
- }
-
- void setHandle(View view) {
- mHandle = view;
- }
-
- void setDragAndDropEnabled(boolean enabled) {
- mDragAndDropEnabled = enabled;
- }
-
- @Override
- public DropTarget getDropTargetDelegate(DragSource source, int x, int y, int xOffset, int yOffset,
- DragView dragView, Object dragInfo) {
- return null;
- }
}
diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java
index 995877b..6e2a58b 100644
--- a/src/com/android/launcher2/BubbleTextView.java
+++ b/src/com/android/launcher2/BubbleTextView.java
@@ -16,18 +16,19 @@
package com.android.launcher2;
+import com.android.launcher.R;
+
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
-import android.graphics.RectF;
+import android.graphics.Rect;
+import android.graphics.Region.Op;
import android.graphics.drawable.Drawable;
-import android.text.Layout;
import android.util.AttributeSet;
-
-import com.android.launcher.R;
+import android.view.MotionEvent;
/**
* TextView that draws a bubble behind the text. We cannot use a LineBackgroundSpan
@@ -44,16 +45,23 @@
static final float PADDING_H = 8.0f;
static final float PADDING_V = 3.0f;
- private final RectF mRect = new RectF();
private Paint mPaint;
private float mBubbleColorAlpha;
private int mPrevAlpha = -1;
+ private final HolographicOutlineHelper mOutlineHelper = new HolographicOutlineHelper();
+ private final Canvas mTempCanvas = new Canvas();
+ private final Rect mTempRect = new Rect();
+ private final Paint mTempPaint = new Paint();
+ private boolean mDidInvalidateForPressedState;
+ private Bitmap mPressedOrFocusedBackground;
+ private int mFocusedOutlineColor;
+ private int mFocusedGlowColor;
+ private int mPressedOutlineColor;
+ private int mPressedGlowColor;
+
private boolean mBackgroundSizeChanged;
private Drawable mBackground;
- private float mCornerRadius;
- private float mPaddingH;
- private float mPaddingV;
public BubbleTextView(Context context) {
super(context);
@@ -80,12 +88,13 @@
mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
mPaint.setColor(bubbleColor);
mBubbleColorAlpha = Color.alpha(bubbleColor) / 255.0f;
-
- final float scale = res.getDisplayMetrics().density;
- mCornerRadius = CORNER_RADIUS * scale;
- mPaddingH = PADDING_H * scale;
- //noinspection PointlessArithmeticExpression
- mPaddingV = PADDING_V * scale;
+ mFocusedOutlineColor =
+ getResources().getColor(R.color.workspace_item_focused_outline_color);
+ mFocusedGlowColor = getResources().getColor(R.color.workspace_item_focused_glow_color);
+ mPressedOutlineColor =
+ getResources().getColor(R.color.workspace_item_pressed_outline_color);
+ mPressedGlowColor =
+ getResources().getColor(R.color.workspace_item_pressed_glow_color);
}
protected int getCacheTopPadding() {
@@ -110,7 +119,6 @@
setText(info.title);
buildAndEnableCache();
setTag(info);
-
}
@Override
@@ -128,6 +136,28 @@
@Override
protected void drawableStateChanged() {
+ if (isPressed()) {
+ // In this case, we have already created the pressed outline on ACTION_DOWN,
+ // so we just need to do an invalidate to trigger draw
+ if (!mDidInvalidateForPressedState) {
+ invalidate();
+ }
+ } else {
+ // Otherwise, either clear the pressed/focused background, or create a background
+ // for the focused state
+ final boolean backgroundEmptyBefore = mPressedOrFocusedBackground == null;
+ mPressedOrFocusedBackground = null;
+ if (isFocused()) {
+ mPressedOrFocusedBackground = createGlowingOutline(
+ mTempCanvas, mFocusedGlowColor, mFocusedOutlineColor);
+ invalidate();
+ }
+ final boolean backgroundEmptyNow = mPressedOrFocusedBackground == null;
+ if (!backgroundEmptyBefore && backgroundEmptyNow) {
+ invalidate();
+ }
+ }
+
Drawable d = mBackground;
if (d != null && d.isStateful()) {
d.setState(getDrawableState());
@@ -135,8 +165,91 @@
super.drawableStateChanged();
}
+ /**
+ * Draw the View v into the given Canvas.
+ *
+ * @param v the view to draw
+ * @param destCanvas the canvas to draw on
+ * @param padding the horizontal and vertical padding to use when drawing
+ */
+ private void drawWithPadding(Canvas destCanvas, int padding) {
+ final Rect clipRect = mTempRect;
+ getDrawingRect(clipRect);
+
+ // adjust the clip rect so that we don't include the text label
+ clipRect.bottom =
+ getExtendedPaddingTop() - (int) BubbleTextView.PADDING_V + getLayout().getLineTop(0);
+
+ // Draw the View into the bitmap.
+ // The translate of scrollX and scrollY is necessary when drawing TextViews, because
+ // they set scrollX and scrollY to large values to achieve centered text
+ destCanvas.save();
+ destCanvas.translate(-getScrollX() + padding / 2, -getScrollY() + padding / 2);
+ destCanvas.clipRect(clipRect, Op.REPLACE);
+ draw(destCanvas);
+ destCanvas.restore();
+ }
+
+ /**
+ * Returns a new bitmap to be used as the object outline, e.g. to visualize the drop location.
+ * Responsibility for the bitmap is transferred to the caller.
+ */
+ private Bitmap createGlowingOutline(Canvas canvas, int outlineColor, int glowColor) {
+ final int padding = HolographicOutlineHelper.MAX_OUTER_BLUR_RADIUS;
+ final Bitmap b = Bitmap.createBitmap(
+ getWidth() + padding, getHeight() + padding, Bitmap.Config.ARGB_8888);
+
+ canvas.setBitmap(b);
+ drawWithPadding(canvas, padding);
+ mOutlineHelper.applyExtraThickExpensiveOutlineWithBlur(b, canvas, glowColor, outlineColor);
+
+ return b;
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent event) {
+ // Call the superclass onTouchEvent first, because sometimes it changes the state to
+ // isPressed() on an ACTION_UP
+ boolean result = super.onTouchEvent(event);
+
+ switch (event.getAction()) {
+ case MotionEvent.ACTION_DOWN:
+ // So that the pressed outline is visible immediately when isPressed() is true,
+ // we pre-create it on ACTION_DOWN (it takes a small but perceptible amount of time
+ // to create it)
+ if (mPressedOrFocusedBackground == null) {
+ mPressedOrFocusedBackground = createGlowingOutline(
+ mTempCanvas, mPressedGlowColor, mPressedOutlineColor);
+ }
+ // Invalidate so the pressed state is visible, or set a flag so we know that we
+ // have to call invalidate as soon as the state is "pressed"
+ if (isPressed()) {
+ mDidInvalidateForPressedState = true;
+ invalidate();
+ } else {
+ mDidInvalidateForPressedState = false;
+ }
+ break;
+ case MotionEvent.ACTION_CANCEL:
+ case MotionEvent.ACTION_UP:
+ // If we've touched down and up on an item, and it's still not "pressed", then
+ // destroy the pressed outline
+ if (!isPressed()) {
+ mPressedOrFocusedBackground = null;
+ }
+ break;
+ }
+ return result;
+ }
+
@Override
public void draw(Canvas canvas) {
+ if (mPressedOrFocusedBackground != null && (isPressed() || isFocused())) {
+ canvas.drawBitmap(mPressedOrFocusedBackground,
+ mScrollX - HolographicOutlineHelper.MAX_OUTER_BLUR_RADIUS / 2,
+ mScrollY - HolographicOutlineHelper.MAX_OUTER_BLUR_RADIUS / 2,
+ mTempPaint);
+ }
if (isBuildingCache()) {
// We enhance the shadow by drawing the shadow twice
this.setShadowLayer(SHADOW_LARGE_RADIUS, 0.0f, SHADOW_Y_OFFSET, SHADOW_LARGE_COLOUR);
@@ -162,7 +275,6 @@
canvas.translate(-scrollX, -scrollY);
}
}
-
super.draw(canvas);
}
}
diff --git a/src/com/android/launcher2/DeleteZone.java b/src/com/android/launcher2/DeleteZone.java
index 33f384f..b044ea8 100644
--- a/src/com/android/launcher2/DeleteZone.java
+++ b/src/com/android/launcher2/DeleteZone.java
@@ -18,7 +18,6 @@
import android.content.Context;
import android.content.res.TypedArray;
-import android.graphics.Paint;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.Rect;
@@ -31,26 +30,15 @@
import android.view.animation.Animation;
import android.view.animation.AnimationSet;
import android.view.animation.TranslateAnimation;
-import android.widget.ImageView;
import com.android.launcher.R;
-public class DeleteZone extends ImageView implements DropTarget, DragController.DragListener {
+public class DeleteZone extends IconDropTarget {
private static final int ORIENTATION_HORIZONTAL = 1;
private static final int TRANSITION_DURATION = 250;
private static final int ANIMATION_DURATION = 200;
-
- private final int[] mLocation = new int[2];
-
- private Launcher mLauncher;
- private boolean mTrashMode;
-
- /**
- * If true, this View responsible for managing its own visibility, and that of its handle.
- * This is generally the case, but it will be set to false when this is part of the
- * Contextual Action Bar.
- */
- private boolean mDragAndDropEnabled = true;
+ private static final int XLARGE_TRANSITION_DURATION = 150;
+ private static final int XLARGE_ANIMATION_DURATION = 200;
private AnimationSet mInAnimation;
private AnimationSet mOutAnimation;
@@ -63,10 +51,6 @@
private final RectF mRegionF = new RectF();
private final Rect mRegion = new Rect();
private TransitionDrawable mTransition;
- private final Paint mTrashPaint = new Paint();
-
- /** The View that this view will replace. */
- private View mHandle = null;
public DeleteZone(Context context, AttributeSet attrs) {
this(context, attrs, 0);
@@ -75,8 +59,11 @@
public DeleteZone(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
+ mOuterDragPadding = getResources().getDimensionPixelSize(R.dimen.delete_zone_size);
+ mInnerDragPadding = getResources().getDimensionPixelSize(R.dimen.delete_zone_padding);
+
final int srcColor = context.getResources().getColor(R.color.delete_color_filter);
- mTrashPaint.setColorFilter(new PorterDuffColorFilter(srcColor, PorterDuff.Mode.SRC_ATOP));
+ mHoverPaint.setColorFilter(new PorterDuffColorFilter(srcColor, PorterDuff.Mode.SRC_ATOP));
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.DeleteZone, defStyle, 0);
mOrientation = a.getInt(R.styleable.DeleteZone_direction, ORIENTATION_HORIZONTAL);
@@ -143,26 +130,24 @@
public void onDragEnter(DragSource source, int x, int y, int xOffset, int yOffset,
DragView dragView, Object dragInfo) {
- if (!mDragAndDropEnabled) return;
- mTransition.reverseTransition(TRANSITION_DURATION);
- dragView.setPaint(mTrashPaint);
- }
-
- public void onDragOver(DragSource source, int x, int y, int xOffset, int yOffset,
- DragView dragView, Object dragInfo) {
+ if (mDragAndDropEnabled) {
+ mTransition.reverseTransition(getTransitionAnimationDuration());
+ super.onDragEnter(source, x, y, xOffset, yOffset, dragView, dragInfo);
+ }
}
public void onDragExit(DragSource source, int x, int y, int xOffset, int yOffset,
DragView dragView, Object dragInfo) {
- if (!mDragAndDropEnabled) return;
- mTransition.reverseTransition(TRANSITION_DURATION);
- dragView.setPaint(null);
+ if (mDragAndDropEnabled) {
+ mTransition.reverseTransition(getTransitionAnimationDuration());
+ super.onDragExit(source, x, y, xOffset, yOffset, dragView, dragInfo);
+ }
}
public void onDragStart(DragSource source, Object info, int dragAction) {
final ItemInfo item = (ItemInfo) info;
if (item != null && mDragAndDropEnabled) {
- mTrashMode = true;
+ mActive = true;
getHitRect(mRegion);
mRegionF.set(mRegion);
@@ -188,8 +173,8 @@
}
public void onDragEnd() {
- if (mTrashMode && mDragAndDropEnabled) {
- mTrashMode = false;
+ if (mActive && mDragAndDropEnabled) {
+ mActive = false;
mDragController.setDeleteRegion(null);
if (mOutAnimation != null) startAnimation(mOutAnimation);
@@ -200,33 +185,11 @@
}
}
- public boolean isDropEnabled() {
- return true;
- }
-
- @Override
- public void getHitRect(Rect outRect) {
- super.getHitRect(outRect);
- if (LauncherApplication.isScreenXLarge()) {
- // TODO: This is a temporary hack. mManageVisiblity = false when you're in CAB mode.
- // In that case, this icon is more tightly spaced next to the delete icon so we want
- // it to have a smaller drag region. When the new drag&drop system comes in, we'll
- // dispatch the drag/drop by calculating what target you're overlapping
- final int padding = R.dimen.delete_zone_padding;
- final int outerDragPadding =
- getResources().getDimensionPixelSize(R.dimen.delete_zone_size);
- final int innerDragPadding = getResources().getDimensionPixelSize(padding);
- outRect.top -= outerDragPadding;
- outRect.left -= innerDragPadding;
- outRect.bottom += outerDragPadding;
- outRect.right += innerDragPadding;
- }
- }
-
private void createAnimations() {
+ int duration = getAnimationDuration();
if (mHandleInAnimation == null) {
mHandleInAnimation = new AlphaAnimation(0.0f, 1.0f);
- mHandleInAnimation.setDuration(ANIMATION_DURATION);
+ mHandleInAnimation.setDuration(duration);
}
if (mInAnimation == null) {
@@ -244,7 +207,7 @@
1.0f, Animation.RELATIVE_TO_SELF, 0.0f, Animation.ABSOLUTE, 0.0f,
Animation.ABSOLUTE, 0.0f));
}
- animationSet.setDuration(ANIMATION_DURATION);
+ animationSet.setDuration(duration);
} else {
mInAnimation.addAnimation(mHandleInAnimation);
}
@@ -253,7 +216,7 @@
if (mHandleOutAnimation == null) {
mHandleOutAnimation = new AlphaAnimation(1.0f, 0.0f);
mHandleOutAnimation.setFillAfter(true);
- mHandleOutAnimation.setDuration(ANIMATION_DURATION);
+ mHandleOutAnimation.setDuration(duration);
}
if (mOutAnimation == null) {
@@ -271,27 +234,25 @@
0.0f, Animation.RELATIVE_TO_SELF, 1.0f, Animation.ABSOLUTE, 0.0f,
Animation.ABSOLUTE, 0.0f));
}
- animationSet.setDuration(ANIMATION_DURATION);
+ animationSet.setDuration(duration);
} else {
mOutAnimation.addAnimation(mHandleOutAnimation);
}
}
}
- void setLauncher(Launcher launcher) {
- mLauncher = launcher;
- }
-
void setDragController(DragController dragController) {
mDragController = dragController;
}
- void setHandle(View view) {
- mHandle = view;
+ private int getTransitionAnimationDuration() {
+ return LauncherApplication.isScreenXLarge() ?
+ XLARGE_TRANSITION_DURATION : TRANSITION_DURATION;
}
- void setDragAndDropEnabled(boolean enabled) {
- mDragAndDropEnabled = enabled;
+ private int getAnimationDuration() {
+ return LauncherApplication.isScreenXLarge() ?
+ XLARGE_ANIMATION_DURATION : ANIMATION_DURATION;
}
private static class FastTranslateAnimation extends TranslateAnimation {
@@ -327,10 +288,4 @@
return false;
}
}
-
- @Override
- public DropTarget getDropTargetDelegate(DragSource source, int x, int y, int xOffset, int yOffset,
- DragView dragView, Object dragInfo) {
- return null;
- }
}
diff --git a/src/com/android/launcher2/HolographicOutlineHelper.java b/src/com/android/launcher2/HolographicOutlineHelper.java
index 0311afa..6d0899d 100644
--- a/src/com/android/launcher2/HolographicOutlineHelper.java
+++ b/src/com/android/launcher2/HolographicOutlineHelper.java
@@ -31,26 +31,30 @@
private final Paint mErasePaint = new Paint();
private final Paint mAlphaClipPaint = new Paint();
- public static final int OUTER_BLUR_RADIUS;
+ public static final int MAX_OUTER_BLUR_RADIUS;
+ private static final BlurMaskFilter sExtraThickOuterBlurMaskFilter;
private static final BlurMaskFilter sThickOuterBlurMaskFilter;
private static final BlurMaskFilter sMediumOuterBlurMaskFilter;
private static final BlurMaskFilter sThinOuterBlurMaskFilter;
private static final BlurMaskFilter sThickInnerBlurMaskFilter;
+ private static final BlurMaskFilter sExtraThickInnerBlurMaskFilter;
private static final BlurMaskFilter sMediumInnerBlurMaskFilter;
private static final int THICK = 0;
private static final int MEDIUM = 1;
+ private static final int EXTRA_THICK = 2;
static {
final float scale = LauncherApplication.getScreenDensity();
- OUTER_BLUR_RADIUS = (int) (scale * 6.0f);
+ MAX_OUTER_BLUR_RADIUS = (int) (scale * 12.0f);
- sThickOuterBlurMaskFilter = new BlurMaskFilter(OUTER_BLUR_RADIUS,
- BlurMaskFilter.Blur.OUTER);
+ sExtraThickOuterBlurMaskFilter = new BlurMaskFilter(scale * 12.0f, BlurMaskFilter.Blur.OUTER);
+ sThickOuterBlurMaskFilter = new BlurMaskFilter(scale * 6.0f, BlurMaskFilter.Blur.OUTER);
sMediumOuterBlurMaskFilter = new BlurMaskFilter(scale * 2.0f, BlurMaskFilter.Blur.OUTER);
sThinOuterBlurMaskFilter = new BlurMaskFilter(scale * 1.0f, BlurMaskFilter.Blur.OUTER);
+ sExtraThickInnerBlurMaskFilter = new BlurMaskFilter(scale * 6.0f, BlurMaskFilter.Blur.NORMAL);
sThickInnerBlurMaskFilter = new BlurMaskFilter(scale * 4.0f, BlurMaskFilter.Blur.NORMAL);
sMediumInnerBlurMaskFilter = new BlurMaskFilter(scale * 2.0f, BlurMaskFilter.Blur.NORMAL);
}
@@ -122,19 +126,50 @@
Bitmap glowShape = srcDst.extractAlpha(mAlphaClipPaint, mTempOffset);
// calculate the outer blur first
- mBlurPaint.setMaskFilter(thickness == THICK ? sThickOuterBlurMaskFilter :
- sMediumOuterBlurMaskFilter);
+ BlurMaskFilter outerBlurMaskFilter;
+ switch (thickness) {
+ case EXTRA_THICK:
+ outerBlurMaskFilter = sExtraThickOuterBlurMaskFilter;
+ break;
+ case THICK:
+ outerBlurMaskFilter = sThickOuterBlurMaskFilter;
+ break;
+ case MEDIUM:
+ outerBlurMaskFilter = sMediumOuterBlurMaskFilter;
+ break;
+ default:
+ throw new RuntimeException("Invalid blur thickness");
+ }
+ mBlurPaint.setMaskFilter(outerBlurMaskFilter);
int[] outerBlurOffset = new int[2];
Bitmap thickOuterBlur = glowShape.extractAlpha(mBlurPaint, outerBlurOffset);
- mBlurPaint.setMaskFilter(sThinOuterBlurMaskFilter);
- int[] thinOuterBlurOffset = new int[2];
- Bitmap thinOuterBlur = glowShape.extractAlpha(mBlurPaint, thinOuterBlurOffset);
+ if (thickness == EXTRA_THICK) {
+ mBlurPaint.setMaskFilter(sMediumOuterBlurMaskFilter);
+ } else {
+ mBlurPaint.setMaskFilter(sThinOuterBlurMaskFilter);
+ }
+
+ int[] brightOutlineOffset = new int[2];
+ Bitmap brightOutline = glowShape.extractAlpha(mBlurPaint, brightOutlineOffset);
// calculate the inner blur
srcDstCanvas.setBitmap(glowShape);
srcDstCanvas.drawColor(0xFF000000, PorterDuff.Mode.SRC_OUT);
- mBlurPaint.setMaskFilter(thickness == THICK ? sThickInnerBlurMaskFilter :
- sMediumInnerBlurMaskFilter);
+ BlurMaskFilter innerBlurMaskFilter;
+ switch (thickness) {
+ case EXTRA_THICK:
+ innerBlurMaskFilter = sExtraThickInnerBlurMaskFilter;
+ break;
+ case THICK:
+ innerBlurMaskFilter = sThickInnerBlurMaskFilter;
+ break;
+ case MEDIUM:
+ innerBlurMaskFilter = sMediumInnerBlurMaskFilter;
+ break;
+ default:
+ throw new RuntimeException("Invalid blur thickness");
+ }
+ mBlurPaint.setMaskFilter(innerBlurMaskFilter);
int[] thickInnerBlurOffset = new int[2];
Bitmap thickInnerBlur = glowShape.extractAlpha(mBlurPaint, thickInnerBlurOffset);
@@ -158,16 +193,21 @@
// draw the bright outline
mHolographicPaint.setColor(outlineColor);
- srcDstCanvas.drawBitmap(thinOuterBlur, thinOuterBlurOffset[0], thinOuterBlurOffset[1],
+ srcDstCanvas.drawBitmap(brightOutline, brightOutlineOffset[0], brightOutlineOffset[1],
mHolographicPaint);
// cleanup
- thinOuterBlur.recycle();
+ brightOutline.recycle();
thickOuterBlur.recycle();
thickInnerBlur.recycle();
glowShape.recycle();
}
+ void applyExtraThickExpensiveOutlineWithBlur(Bitmap srcDst, Canvas srcDstCanvas, int color,
+ int outlineColor) {
+ applyExpensiveOutlineWithBlur(srcDst, srcDstCanvas, color, outlineColor, EXTRA_THICK);
+ }
+
void applyThickExpensiveOutlineWithBlur(Bitmap srcDst, Canvas srcDstCanvas, int color,
int outlineColor) {
applyExpensiveOutlineWithBlur(srcDst, srcDstCanvas, color, outlineColor, THICK);
diff --git a/src/com/android/launcher2/IconDropTarget.java b/src/com/android/launcher2/IconDropTarget.java
new file mode 100644
index 0000000..5b375c3
--- /dev/null
+++ b/src/com/android/launcher2/IconDropTarget.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2010 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.launcher2;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.android.launcher.R;
+
+/**
+ * Implements a DropTarget which allows applications to be dropped on it,
+ * in order to launch the application info for that app.
+ */
+public class IconDropTarget extends ImageView implements DropTarget, DragController.DragListener {
+ protected Launcher mLauncher;
+
+ /**
+ * If true, this View responsible for managing its own visibility, and that of its handle.
+ * This is generally the case, but it will be set to false when this is part of the
+ * Contextual Action Bar.
+ */
+ protected boolean mDragAndDropEnabled;
+
+ /** Whether this drop target is active for the current drag */
+ protected boolean mActive;
+
+ /** The view that this view should appear in the place of. */
+ protected View mHandle = null;
+
+ /** The paint applied to the drag view on hover */
+ protected final Paint mHoverPaint = new Paint();
+
+ /** Drag zone padding */
+ protected int mInnerDragPadding;
+ protected int mOuterDragPadding;
+
+ public IconDropTarget(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public IconDropTarget(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ mDragAndDropEnabled = true;
+ }
+
+ void setLauncher(Launcher launcher) {
+ mLauncher = launcher;
+ }
+
+ void setHandle(View view) {
+ mHandle = view;
+ }
+
+ void setDragAndDropEnabled(boolean enabled) {
+ mDragAndDropEnabled = enabled;
+ }
+
+ public boolean acceptDrop(DragSource source, int x, int y, int xOffset, int yOffset,
+ DragView dragView, Object dragInfo) {
+ return false;
+ }
+
+ public void onDrop(DragSource source, int x, int y, int xOffset, int yOffset,
+ DragView dragView, Object dragInfo) {
+ // Do nothing
+ }
+
+ public void onDragEnter(DragSource source, int x, int y, int xOffset, int yOffset,
+ DragView dragView, Object dragInfo) {
+ if (mDragAndDropEnabled) {
+ dragView.setPaint(mHoverPaint);
+ }
+ }
+
+ public void onDragOver(DragSource source, int x, int y, int xOffset, int yOffset,
+ DragView dragView, Object dragInfo) {
+ // Do nothing
+ }
+
+ public void onDragExit(DragSource source, int x, int y, int xOffset, int yOffset,
+ DragView dragView, Object dragInfo) {
+ if (mDragAndDropEnabled) {
+ dragView.setPaint(null);
+ }
+ }
+
+ public void onDragStart(DragSource source, Object info, int dragAction) {
+ // Do nothing
+ }
+
+ public boolean isDropEnabled() {
+ return mDragAndDropEnabled && mActive;
+ }
+
+ public void onDragEnd() {
+ // Do nothing
+ }
+
+ @Override
+ public void getHitRect(Rect outRect) {
+ super.getHitRect(outRect);
+ if (LauncherApplication.isScreenXLarge()) {
+ outRect.top -= mOuterDragPadding;
+ outRect.left -= mInnerDragPadding;
+ outRect.bottom += mOuterDragPadding;
+ outRect.right += mOuterDragPadding;
+ }
+ }
+
+ @Override
+ public DropTarget getDropTargetDelegate(DragSource source, int x, int y, int xOffset,
+ int yOffset, DragView dragView, Object dragInfo) {
+ return null;
+ }
+}
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 455b130..130cb76 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -261,9 +261,9 @@
new HashMap<View, AppWidgetProviderInfo>();
// External icons saved in case of resource changes, orientation, etc.
- private static Drawable sGlobalSearchIcon;
- private static Drawable sVoiceSearchIcon;
- private static Drawable sAppMarketIcon;
+ private static Drawable.ConstantState sGlobalSearchIcon;
+ private static Drawable.ConstantState sVoiceSearchIcon;
+ private static Drawable.ConstantState sAppMarketIcon;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -974,7 +974,6 @@
if (allAppsInfoTarget != null) {
allAppsInfoTarget.setLauncher(this);
dragController.addDragListener(allAppsInfoTarget);
- allAppsInfoTarget.setDragColor(getResources().getColor(R.color.app_info_filter));
allAppsInfoTarget.setDragAndDropEnabled(false);
View marketButton = findViewById(R.id.market_button);
if (marketButton != null) {
@@ -986,7 +985,6 @@
if (infoButton != null) {
infoButton.setLauncher(this);
infoButton.setHandle(findViewById(R.id.configure_button));
- infoButton.setDragColor(getResources().getColor(R.color.app_info_filter));
dragController.addDragListener(infoButton);
}
@@ -2998,7 +2996,7 @@
}
// if successful in getting icon, return it; otherwise, set button to use default drawable
- private Drawable updateButtonWithIconFromExternalActivity(
+ private Drawable.ConstantState updateButtonWithIconFromExternalActivity(
int buttonId, ComponentName activityName, int fallbackDrawableId) {
ImageView button = (ImageView) findViewById(buttonId);
Drawable toolbarIcon = null;
@@ -3023,13 +3021,13 @@
return null;
} else {
button.setImageDrawable(toolbarIcon);
- return toolbarIcon;
+ return toolbarIcon.getConstantState();
}
}
- private void updateButtonWithDrawable(int buttonId, Drawable d) {
+ private void updateButtonWithDrawable(int buttonId, Drawable.ConstantState d) {
ImageView button = (ImageView) findViewById(buttonId);
- button.setImageDrawable(d);
+ button.setImageDrawable(d.newDrawable(getResources()));
}
private void updateGlobalSearchIcon() {
@@ -3046,7 +3044,7 @@
}
}
- private void updateGlobalSearchIcon(Drawable d) {
+ private void updateGlobalSearchIcon(Drawable.ConstantState d) {
updateButtonWithDrawable(R.id.search_button, d);
}
@@ -3063,7 +3061,7 @@
}
}
- private void updateVoiceSearchIcon(Drawable d) {
+ private void updateVoiceSearchIcon(Drawable.ConstantState d) {
updateButtonWithDrawable(R.id.voice_button, d);
}
@@ -3084,7 +3082,7 @@
}
}
- private void updateAppMarketIcon(Drawable d) {
+ private void updateAppMarketIcon(Drawable.ConstantState d) {
updateButtonWithDrawable(R.id.market_button, d);
}
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index bbcd0af..f70480d 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -601,6 +601,11 @@
return mChildrenOutlineAlpha;
}
+ private void showBackgroundGradientForAllApps() {
+ showBackgroundGradient();
+ mDrawCustomizeTrayBackground = false;
+ }
+
private void showBackgroundGradientForCustomizeTray() {
showBackgroundGradient();
mDrawCustomizeTrayBackground = true;
@@ -767,18 +772,18 @@
mCustomizationDrawerTransformedPos[1] = mCustomizationDrawerContent.getTop();
m.mapPoints(mCustomizationDrawerTransformedPos);
+ // Draw the bg glow behind the gradient
+ mCustomizeTrayBackground.setAlpha(alpha);
+ mCustomizeTrayBackground.setBounds(mScrollX, 0, mScrollX + getMeasuredWidth(),
+ getMeasuredHeight());
+ mCustomizeTrayBackground.draw(canvas);
+
// Draw the bg gradient
final int offset = (int) (mCustomizationDrawerPos[1] +
mCustomizationDrawerTransformedPos[1]);
mBackground.setBounds(mScrollX, offset, mScrollX + getMeasuredWidth(),
offset + getMeasuredHeight());
mBackground.draw(canvas);
-
- // Draw the bg glow
- mCustomizeTrayBackground.setAlpha(alpha);
- mCustomizeTrayBackground.setBounds(mScrollX, 0, mScrollX + getMeasuredWidth(),
- getMeasuredHeight());
- mCustomizeTrayBackground.draw(canvas);
}
}
super.onDraw(canvas);
@@ -1084,7 +1089,7 @@
if (shrinkState == ShrinkState.TOP) {
showBackgroundGradientForCustomizeTray();
} else {
- showBackgroundGradient();
+ showBackgroundGradientForAllApps();
}
}
@@ -1202,7 +1207,7 @@
final Canvas canvas = new Canvas();
// We need to add extra padding to the bitmap to make room for the glow effect
- final int bitmapPadding = HolographicOutlineHelper.OUTER_BLUR_RADIUS;
+ final int bitmapPadding = HolographicOutlineHelper.MAX_OUTER_BLUR_RADIUS;
// The outline is used to visualize where the item will land if dropped
mDragOutline = createDragOutline(b, canvas, bitmapPadding);
@@ -1447,7 +1452,7 @@
final Canvas canvas = new Canvas();
// We need to add extra padding to the bitmap to make room for the glow effect
- final int bitmapPadding = HolographicOutlineHelper.OUTER_BLUR_RADIUS;
+ final int bitmapPadding = HolographicOutlineHelper.MAX_OUTER_BLUR_RADIUS;
// The outline is used to visualize where the item will land if dropped
mDragOutline = createDragOutline(child, canvas, bitmapPadding);
@@ -1788,7 +1793,7 @@
// Create the drag outline
// We need to add extra padding to the bitmap to make room for the glow effect
final Canvas canvas = new Canvas();
- final int bitmapPadding = HolographicOutlineHelper.OUTER_BLUR_RADIUS;
+ final int bitmapPadding = HolographicOutlineHelper.MAX_OUTER_BLUR_RADIUS;
mDragOutline = createExternalDragOutline(canvas, bitmapPadding);
// Show the current page outlines to indicate that we can accept this drop
@@ -2241,8 +2246,10 @@
mSpringLoadedDragController = new SpringLoadedDragController(mLauncher);
mCustomizationDrawer = mLauncher.findViewById(R.id.customization_drawer);
- mCustomizationDrawerContent =
- mCustomizationDrawer.findViewById(com.android.internal.R.id.tabcontent);
+ if (mCustomizationDrawer != null) {
+ mCustomizationDrawerContent =
+ mCustomizationDrawer.findViewById(com.android.internal.R.id.tabcontent);
+ }
}
public void setDragController(DragController dragController) {