diff options
4 files changed, 11 insertions, 5 deletions
diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java index ff02bbbc3..d13f66a7c 100644 --- a/src/com/android/launcher3/FastBitmapDrawable.java +++ b/src/com/android/launcher3/FastBitmapDrawable.java @@ -113,12 +113,20 @@ class FastBitmapDrawable extends Drawable { @Override public int getIntrinsicWidth() { - return mBitmap.getWidth(); + int width = getBounds().width(); + if (width == 0) { + width = mBitmap.getWidth(); + } + return width; } @Override public int getIntrinsicHeight() { - return mBitmap.getHeight(); + int height = getBounds().height(); + if (height == 0) { + height = mBitmap.getHeight(); + } + return height; } @Override diff --git a/src/com/android/launcher3/HolographicImageView.java b/src/com/android/launcher3/HolographicImageView.java index 18ac092e6..33ab8b5a6 100644 --- a/src/com/android/launcher3/HolographicImageView.java +++ b/src/com/android/launcher3/HolographicImageView.java @@ -80,7 +80,6 @@ public class HolographicImageView extends ImageView { protected void drawableStateChanged() { super.drawableStateChanged(); - mHolographicHelper.generatePressedFocusedStates(this); Drawable d = getDrawable(); if (d instanceof StateListDrawable) { StateListDrawable sld = (StateListDrawable) d; diff --git a/src/com/android/launcher3/HolographicLinearLayout.java b/src/com/android/launcher3/HolographicLinearLayout.java index 5344a7ee9..96acb03c3 100644 --- a/src/com/android/launcher3/HolographicLinearLayout.java +++ b/src/com/android/launcher3/HolographicLinearLayout.java @@ -84,7 +84,6 @@ public class HolographicLinearLayout extends LinearLayout { super.drawableStateChanged(); if (mImageView != null) { - mHolographicHelper.generatePressedFocusedStates(mImageView); Drawable d = mImageView.getDrawable(); if (d instanceof StateListDrawable) { StateListDrawable sld = (StateListDrawable) d; diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 3ce4a57fc..041d21bd3 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -4338,7 +4338,7 @@ public class Launcher extends Activity final SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE); ComponentName activityName = searchManager.getGlobalSearchActivity(); - if (activityName != null && mWorkspace.shouldVoiceButtonProxyBeVisible()) { + if (activityName != null) { int coi = getCurrentOrientationIndexForGlobalIcons(); sGlobalSearchIcon[coi] = updateButtonWithIconFromExternalActivity( R.id.search_button, activityName, R.drawable.ic_home_search_normal_holo, |