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

Commit f2b09619 authored by Adam Powell's avatar Adam Powell
Browse files

Fix bug 5095223 - ICS action bar incorrectly resizing app icons 

Remove experimental auto-mipmapping of icons.

Change-Id: I326ca396331a050985200b2ecf0d892474262916
parent 13ed7435

core/java/com/android/internal/widget/ActionBarView.java

+1 −20
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ public class ActionBarView extends AbsActionBarView { 
    }



    public void setIcon(int resId) {

        setIcon(mContext.getResources().getDrawableForDensity(resId, getPreferredIconDensity()));

        setIcon(mContext.getResources().getDrawable(resId));

    }



    public void setLogo(Drawable logo) {
@@ -593,25 +593,6 @@ public class ActionBarView extends AbsActionBarView { 
        setLogo(mContext.getResources().getDrawable(resId));

    }



    /**

     * @return Drawable density to load that will best fit the available height.

     */

    private int getPreferredIconDensity() {

        final Resources res = mContext.getResources();

        final int availableHeight = getLayoutParams().height -

                mHomeLayout.getVerticalIconPadding();

        int iconSize = res.getDimensionPixelSize(android.R.dimen.app_icon_size);



        if (iconSize * DisplayMetrics.DENSITY_LOW >= availableHeight) {

            return DisplayMetrics.DENSITY_LOW;

        } else if (iconSize * DisplayMetrics.DENSITY_MEDIUM >= availableHeight) {

            return DisplayMetrics.DENSITY_MEDIUM;

        } else if (iconSize * DisplayMetrics.DENSITY_HIGH >= availableHeight) {

            return DisplayMetrics.DENSITY_HIGH;

        }

        return DisplayMetrics.DENSITY_XHIGH;

    }



    public void setNavigationMode(int mode) {

        final int oldMode = mNavigationMode;

        if (mode != oldMode) {