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

Commit 176a88ff authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master

parents 6efe03b1 19563cc2

core/java/android/widget/AbsSeekBar.java

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ public abstract class AbsSeekBar extends ProgressBar { 
        // ...but allow layout to override this

        int thumbOffset =

                a.getDimensionPixelOffset(com.android.internal.R.styleable.SeekBar_thumbOffset, getThumbOffset());

	setThumbOffset(thumbOffset);

        a.recycle();



        a = context.obtainStyledAttributes(attrs,

core/java/android/widget/ProgressBar.java

+9 −0
Original line number Diff line number Diff line
@@ -177,6 +177,8 @@ public class ProgressBar extends View { 
        Drawable drawable = a.getDrawable(R.styleable.ProgressBar_progressDrawable);

        if (drawable != null) {

            drawable = tileify(drawable, false);

            // Calling this method can set mMaxHeight, make sure the corresponding

            // XML attribute for mMaxHeight is read after calling this method

            setProgressDrawable(drawable);

        }
@@ -421,6 +423,13 @@ public class ProgressBar extends View { 
    public void setProgressDrawable(Drawable d) {

        if (d != null) {

            d.setCallback(this);



            // Make sure the ProgressBar is always tall enough

            int drawableHeight = d.getMinimumHeight();

            if (mMaxHeight < drawableHeight) {

                mMaxHeight = drawableHeight;

                requestLayout();

            }

        }

        mProgressDrawable = d;

        if (!mIndeterminate) {

core/java/android/widget/ViewAnimator.java

+3 −2
Original line number Diff line number Diff line
@@ -138,14 +138,15 @@ public class ViewAnimator extends FrameLayout { 
        final int count = getChildCount();

        for (int i = 0; i < count; i++) {

            final View child = getChildAt(i);

            final boolean checkForFirst = (!mFirstTime || mAnimateFirstTime);

            if (i == childIndex) {

                if ((!mFirstTime || mAnimateFirstTime) && mInAnimation != null) {

                if (checkForFirst && mInAnimation != null) {

                    child.startAnimation(mInAnimation);

                }

                child.setVisibility(View.VISIBLE);

                mFirstTime = false;

            } else {

                if (mOutAnimation != null && child.getVisibility() == View.VISIBLE) {

                if (checkForFirst && mOutAnimation != null && child.getVisibility() == View.VISIBLE) {

                    child.startAnimation(mOutAnimation);

                } else if (child.getAnimation() == mInAnimation)

                    child.clearAnimation();

services/java/com/android/server/LocationManagerService.java

+1 −3
Original line number Diff line number Diff line
@@ -1204,12 +1204,10 @@ public class LocationManagerService extends ILocationManager.Stub implements Run 
            // Remove expired alerts

            if (intentsToRemove != null) {

                for (PendingIntent i : intentsToRemove) {

                    mProximityAlerts.remove(i);

                    ProximityAlert alert = mProximityAlerts.get(i);

                    ProximityAlert alert = mProximityAlerts.remove(i);

                    mProximitiesEntered.remove(alert);

                }

            }



        }



        // Note: this is called with the lock held.