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

Commit 9acae658 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 847fbbea: Merge "Localized optimizations in views and bitmaps" into ics-mr1 

* commit '847fbbea':
  Localized optimizations in views and bitmaps
parents 4780228f 847fbbea

core/java/android/widget/EdgeEffect.java

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ public class EdgeEffect { 
        mEdge = res.getDrawable(R.drawable.overscroll_edge);

        mGlow = res.getDrawable(R.drawable.overscroll_glow);



        mMinWidth = (int) (context.getResources().getDisplayMetrics().density * MIN_WIDTH + 0.5f);

        mMinWidth = (int) (res.getDisplayMetrics().density * MIN_WIDTH + 0.5f);

        mInterpolator = new DecelerateInterpolator();

    }

core/java/android/widget/TextView.java

+7 −5
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.res.ColorStateList;

import android.content.res.CompatibilityInfo;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.content.res.XmlResourceParser;
@@ -449,18 +450,19 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        super(context, attrs, defStyle);

        mText = "";



        final Resources res = getResources();

        final CompatibilityInfo compat = res.getCompatibilityInfo();



        mTextPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);

        mTextPaint.density = getResources().getDisplayMetrics().density;

        mTextPaint.setCompatibilityScaling(

                getResources().getCompatibilityInfo().applicationScale);

        mTextPaint.density = res.getDisplayMetrics().density;

        mTextPaint.setCompatibilityScaling(compat.applicationScale);



        // If we get the paint from the skin, we should set it to left, since

        // the layout always wants it to be left.

        // mTextPaint.setTextAlign(Paint.Align.LEFT);



        mHighlightPaint = new Paint(Paint.ANTI_ALIAS_FLAG);

        mHighlightPaint.setCompatibilityScaling(

                getResources().getCompatibilityInfo().applicationScale);

        mHighlightPaint.setCompatibilityScaling(compat.applicationScale);



        mMovement = getDefaultMovementMethod();

        mTransformation = null;

graphics/java/android/graphics/Bitmap.java

+5 −2
Original line number Diff line number Diff line
@@ -604,10 +604,13 @@ public final class Bitmap implements Parcelable { 
        }

        Bitmap bm = nativeCreate(null, 0, width, width, height, config.nativeInt, true);

        if (config == Config.ARGB_8888 && !hasAlpha) {

            bm.eraseColor(0xff000000);

            nativeErase(bm.mNativeBitmap, 0xff000000);

            nativeSetHasAlpha(bm.mNativeBitmap, hasAlpha);

        } else {

            bm.eraseColor(0);

            // No need to initialize it to zeroes; it is backed by a VM byte array

            // which is by definition preinitialized to all zeroes.

            //

            //nativeErase(bm.mNativeBitmap, 0);

        }

        return bm;

    }