From e9a5119836e5e3310c474cb4bb5b7a727bc2415f Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Wed, 4 Jun 2014 01:24:03 +0000
Subject: Revert "Adding debugging and naive fix for issue 15334203"

This reverts commit ed11c14003ca4ae5f702b6eb3f6b5dd8f4e7d4a4.

Change-Id: Ifc46769477e590512cc5ab79a69063c0341f52b2
---
 src/com/android/launcher3/ButtonDropTarget.java |  1 -
 src/com/android/launcher3/InfoDropTarget.java   | 26 ++-----------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

(limited to 'src/com')

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);
     }
 
-- 
cgit v1.2.3