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

Commit ed11c140 authored by Adam Cohen's avatar Adam Cohen
Browse files

Adding debugging and naive fix for issue 15334203 

-> To be reverted, just need signed build.

Change-Id: I6a83e55067d8d2564bb3c4f0c314befbb2793f09
parent 3489f5c1

src/com/android/launcher3/ButtonDropTarget.java

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

+24 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 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;
@@ -49,6 +50,19 @@ 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);

        }
@@ -93,8 +107,14 @@ 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);

    }
@@ -108,7 +128,9 @@ public class InfoDropTarget extends ButtonDropTarget { 
    public void onDragEnter(DragObject d) {

        super.onDragEnter(d);



        if (mDrawable != null) {

            mDrawable.startTransition(mTransitionDuration);

        }

        setTextColor(mHoverColor);

    }