diff options
author | Winson Chung <winsonc@google.com> | 2011-07-11 15:20:48 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2011-07-12 16:04:46 -0700 |
commit | a62e9fd95ae10cff4676f2cc1f4d68334ca27a0b (patch) | |
tree | db42f288a740bbaaf689f070e0aff66367be10de /src/com/android/launcher2/InfoDropTarget.java | |
parent | fe63476a2d0b12dfc692c425d1c6cdbb41774ef0 (diff) | |
download | android_packages_apps_Trebuchet-a62e9fd95ae10cff4676f2cc1f4d68334ca27a0b.tar.gz android_packages_apps_Trebuchet-a62e9fd95ae10cff4676f2cc1f4d68334ca27a0b.tar.bz2 android_packages_apps_Trebuchet-a62e9fd95ae10cff4676f2cc1f4d68334ca27a0b.zip |
Cleaning up some drop-target issues.
- Setting text color during drag over transitions
- Fixing regression in drop target padding
= Using old drop-down animation where possible
Change-Id: Ia1c5ec9e58fc734d28133349d9920d123ed71ae6
Diffstat (limited to 'src/com/android/launcher2/InfoDropTarget.java')
-rw-r--r-- | src/com/android/launcher2/InfoDropTarget.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher2/InfoDropTarget.java b/src/com/android/launcher2/InfoDropTarget.java index 02e3f0182..6ad7630ed 100644 --- a/src/com/android/launcher2/InfoDropTarget.java +++ b/src/com/android/launcher2/InfoDropTarget.java @@ -18,6 +18,7 @@ package com.android.launcher2; import android.content.ComponentName; import android.content.Context; +import android.content.res.ColorStateList; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.PorterDuff; @@ -32,6 +33,7 @@ import com.android.launcher.R; public class InfoDropTarget extends ButtonDropTarget { private TextView mText; + private ColorStateList mOriginalTextColor; private TransitionDrawable mDrawable; private int mHoverColor = 0xFF0000FF; @@ -48,6 +50,7 @@ public class InfoDropTarget extends ButtonDropTarget { super.onFinishInflate(); mText = (TextView) findViewById(R.id.info_target_text); + mOriginalTextColor = mText.getTextColors(); // Get the hover color Resources r = getResources(); @@ -98,6 +101,7 @@ public class InfoDropTarget extends ButtonDropTarget { mActive = isVisible; mDrawable.resetTransition(); + mText.setTextColor(mOriginalTextColor); setVisibility(isVisible ? View.VISIBLE : View.GONE); } @@ -111,6 +115,7 @@ public class InfoDropTarget extends ButtonDropTarget { super.onDragEnter(d); mDrawable.startTransition(mTransitionDuration); + mText.setTextColor(mHoverColor); } public void onDragExit(DragObject d) { @@ -118,6 +123,7 @@ public class InfoDropTarget extends ButtonDropTarget { if (!d.dragComplete) { mDrawable.resetTransition(); + mText.setTextColor(mOriginalTextColor); } } } |