aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-28 15:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Adding debugging and naive fix for issue 15334203"

Browse Source 
This reverts commit ed11c14003.

Change-Id: Ifc46769477e590512cc5ab79a69063c0341f52b2
This commit is contained in:
Adam Cohen
2014-06-04 01:24:03 +00:00
parent ed11c14003
commit e9a5119836
2 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/launcher3/InfoDropTarget.java
View File

@@ -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);
}