diff options
| -rw-r--r-- | res/layout/search_drop_target_bar.xml | 6 | ||||
| -rw-r--r-- | src/com/android/launcher3/ButtonDropTarget.java | 33 |
2 files changed, 8 insertions, 31 deletions
diff --git a/res/layout/search_drop_target_bar.xml b/res/layout/search_drop_target_bar.xml index b0435aa0e..4737ee1bc 100644 --- a/res/layout/search_drop_target_bar.xml +++ b/res/layout/search_drop_target_bar.xml @@ -36,8 +36,6 @@ <com.android.launcher3.DeleteDropTarget android:id="@+id/delete_target_text" style="@style/DropTargetButton" - android:drawableLeft="@drawable/remove_target_selector" - android:drawableStart="@drawable/remove_target_selector" android:text="@string/delete_target_label" /> </FrameLayout> @@ -50,8 +48,6 @@ <com.android.launcher3.InfoDropTarget android:id="@+id/info_target_text" style="@style/DropTargetButton" - android:drawableLeft="@drawable/info_target_selector" - android:drawableStart="@drawable/info_target_selector" android:text="@string/info_target_label" /> </FrameLayout> @@ -64,8 +60,6 @@ <com.android.launcher3.UninstallDropTarget android:id="@+id/uninstall_target_text" style="@style/DropTargetButton" - android:drawableLeft="@drawable/uninstall_target_selector" - android:drawableStart="@drawable/uninstall_target_selector" android:text="@string/delete_target_uninstall_label" /> </FrameLayout> </LinearLayout> diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index b8214d1ef..80b542f1d 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -23,7 +23,6 @@ import android.content.res.ColorStateList; import android.content.res.Configuration; import android.graphics.PointF; import android.graphics.Rect; -import android.graphics.drawable.Drawable; import android.graphics.drawable.TransitionDrawable; import android.os.Build; import android.util.AttributeSet; @@ -85,21 +84,15 @@ public abstract class ButtonDropTarget extends TextView @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1) protected void setDrawable(int resId) { - // Get the hover color - mDrawable = (TransitionDrawable) getCurrentDrawable(); - - if (mDrawable == null) { - // TODO: investigate why this is ever happening. Presently only on one known device. - mDrawable = (TransitionDrawable) getResources().getDrawable(resId); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { - setCompoundDrawablesRelativeWithIntrinsicBounds(mDrawable, null, null, null); - } else { - setCompoundDrawablesWithIntrinsicBounds(mDrawable, null, null, null); - } - } + // We do not set the drawable in the xml as that inflates two drawables corresponding to + // drawableLeft and drawableStart. + mDrawable = (TransitionDrawable) getResources().getDrawable(resId); + mDrawable.setCrossFadeEnabled(true); - if (null != mDrawable) { - mDrawable.setCrossFadeEnabled(true); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { + setCompoundDrawablesRelativeWithIntrinsicBounds(mDrawable, null, null, null); + } else { + setCompoundDrawablesWithIntrinsicBounds(mDrawable, null, null, null); } } @@ -111,16 +104,6 @@ public abstract class ButtonDropTarget extends TextView mSearchDropTargetBar = searchDropTargetBar; } - protected Drawable getCurrentDrawable() { - Drawable[] drawables = getCompoundDrawables(); - for (int i = 0; i < drawables.length; ++i) { - if (drawables[i] != null) { - return drawables[i]; - } - } - return null; - } - @Override public void onFlingToDelete(DragObject d, PointF vec) { } |