summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/InfoDropTarget.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-06-30 18:09:30 -0700
committerWinson Chung <winsonc@google.com>2011-07-01 12:33:32 -0700
commit967289b6d5fec77f5c381d11ffb2319f3bb5e737 (patch)
tree4cee018390432723fb9526a8bf744a5a0a5b9b6a /src/com/android/launcher2/InfoDropTarget.java
parent3ac74c55cf8baef29db80e8c67ab4ab033b04417 (diff)
downloadandroid_packages_apps_Trebuchet-967289b6d5fec77f5c381d11ffb2319f3bb5e737.tar.gz
android_packages_apps_Trebuchet-967289b6d5fec77f5c381d11ffb2319f3bb5e737.tar.bz2
android_packages_apps_Trebuchet-967289b6d5fec77f5c381d11ffb2319f3bb5e737.zip
Adding new assets.
Change-Id: I20c8ceae997290781923caf195f6f87e283b1b7f
Diffstat (limited to 'src/com/android/launcher2/InfoDropTarget.java')
-rw-r--r--src/com/android/launcher2/InfoDropTarget.java17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/com/android/launcher2/InfoDropTarget.java b/src/com/android/launcher2/InfoDropTarget.java
index 76a6bf926..c7812e3de 100644
--- a/src/com/android/launcher2/InfoDropTarget.java
+++ b/src/com/android/launcher2/InfoDropTarget.java
@@ -16,14 +16,13 @@
package com.android.launcher2;
-import android.animation.ObjectAnimator;
import android.content.ComponentName;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
-import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
+import android.graphics.drawable.TransitionDrawable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.TextView;
@@ -33,6 +32,7 @@ import com.android.launcher.R;
public class InfoDropTarget extends ButtonDropTarget {
private TextView mText;
+ private TransitionDrawable mDrawable;
private int mHoverColor = 0xFF0000FF;
public InfoDropTarget(Context context, AttributeSet attrs) {
@@ -54,8 +54,8 @@ public class InfoDropTarget extends ButtonDropTarget {
mHoverColor = r.getColor(R.color.info_target_hover_tint);
mHoverPaint.setColorFilter(new PorterDuffColorFilter(
mHoverColor, PorterDuff.Mode.SRC_ATOP));
- setBackgroundColor(mHoverColor);
- getBackground().setAlpha(0);
+ mDrawable = (TransitionDrawable) mText.getCompoundDrawables()[0];
+ mDrawable.setCrossFadeEnabled(true);
// Remove the text in the Phone UI in landscape
int orientation = getResources().getConfiguration().orientation;
@@ -109,17 +109,12 @@ public class InfoDropTarget extends ButtonDropTarget {
public void onDragEnter(DragObject d) {
super.onDragEnter(d);
- ObjectAnimator anim = ObjectAnimator.ofInt(getBackground(), "alpha",
- Color.alpha(mHoverColor));
- anim.setDuration(mTransitionDuration);
- anim.start();
+ mDrawable.startTransition(mTransitionDuration);
}
public void onDragExit(DragObject d) {
super.onDragExit(d);
- ObjectAnimator anim = ObjectAnimator.ofInt(getBackground(), "alpha", 0);
- anim.setDuration(mTransitionDuration);
- anim.start();
+ mDrawable.resetTransition();
}
}