Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bd73154 authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am e9a51198: Revert "Adding debugging and naive fix for issue 15334203" 

* commit 'e9a51198':
  Revert "Adding debugging and naive fix for issue 15334203"
parents 9b06cd1e e9a51198

src/com/android/launcher3/ButtonDropTarget.java

+0 −1
Original line number Diff line number Diff line
@@ -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;

    }

src/com/android/launcher3/InfoDropTarget.java

+2 −24
Original line number Diff line number Diff line
@@ -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();

        }

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

        }

        setTextColor(mHoverColor);

    }