summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-06-04 01:25:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-04 01:25:22 +0000
commit6bd73154c5f79208aa0fc3ea987847f0b465d319 (patch)
treec0a77cf70660018621f9571ce132717fa67218d7 /src/com
parent9b06cd1e45e3c9188373c957b6133a83ae812cf5 (diff)
parente9a5119836e5e3310c474cb4bb5b7a727bc2415f (diff)
downloadandroid_packages_apps_Trebuchet-6bd73154c5f79208aa0fc3ea987847f0b465d319.tar.gz
android_packages_apps_Trebuchet-6bd73154c5f79208aa0fc3ea987847f0b465d319.tar.bz2
android_packages_apps_Trebuchet-6bd73154c5f79208aa0fc3ea987847f0b465d319.zip
am e9a51198: Revert "Adding debugging and naive fix for issue 15334203"
* commit 'e9a5119836e5e3310c474cb4bb5b7a727bc2415f': Revert "Adding debugging and naive fix for issue 15334203"
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher3/ButtonDropTarget.java1
-rw-r--r--src/com/android/launcher3/InfoDropTarget.java26
2 files changed, 2 insertions, 25 deletions
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index e466e10de..019f86c21 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -75,7 +75,6 @@ public class ButtonDropTarget extends TextView implements DropTarget, DragContro
return drawables[i];
}
}
- System.out.println("No drawable, returning null " + this);
return null;
}
diff --git a/src/com/android/launcher3/InfoDropTarget.java b/src/com/android/launcher3/InfoDropTarget.java
index 254d9bfe8..374238c49 100644
--- a/src/com/android/launcher3/InfoDropTarget.java
+++ b/src/com/android/launcher3/InfoDropTarget.java
@@ -21,7 +21,6 @@ import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.Configuration;
import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
import android.graphics.drawable.TransitionDrawable;
import android.util.AttributeSet;
import android.view.View;
@@ -50,19 +49,6 @@ public class InfoDropTarget extends ButtonDropTarget {
Resources r = getResources();
mHoverColor = r.getColor(R.color.info_target_hover_tint);
mDrawable = (TransitionDrawable) getCurrentDrawable();
-
- if (mDrawable == null) {
- System.out.println("onFinishInflate -- drawable null");
- }
-
- // DEBUG CODE:
- Drawable normal = r.getDrawable(R.drawable.ic_launcher_info_normal_holo);
- Drawable active = r.getDrawable(R.drawable.ic_launcher_info_active_holo);
- Drawable selector = r.getDrawable(R.drawable.info_target_selector);
- System.out.println("Normal: " + normal);
- System.out.println("Active: " + active);
- System.out.println("Selector: " + selector);
-
if (null != mDrawable) {
mDrawable.setCrossFadeEnabled(true);
}
@@ -107,14 +93,8 @@ public class InfoDropTarget extends ButtonDropTarget {
isVisible = false;
}
- if (mDrawable == null) {
- System.out.println("onDragStart -- drawable null");
- }
-
mActive = isVisible;
- if (mDrawable != null) {
- mDrawable.resetTransition();
- }
+ mDrawable.resetTransition();
setTextColor(mOriginalTextColor);
((ViewGroup) getParent()).setVisibility(isVisible ? View.VISIBLE : View.GONE);
}
@@ -128,9 +108,7 @@ public class InfoDropTarget extends ButtonDropTarget {
public void onDragEnter(DragObject d) {
super.onDragEnter(d);
- if (mDrawable != null) {
- mDrawable.startTransition(mTransitionDuration);
- }
+ mDrawable.startTransition(mTransitionDuration);
setTextColor(mHoverColor);
}