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

Commit 6a8253fd authored by Alan Viverette's avatar Alan Viverette
Browse files

Update progress bar and seek bar backgrounds, fix seek bar thumb 

Ensures LayerDrawable copies out the correct layer properties during
"tileification". This really needs to be deprecated or replaced in a
future CL, though, because it is potentially lossy (e.g. for
RippleDrawable, which is an instanceof LayerDrawable).

Bug: 19448441
Change-Id: I483e9c34fd781e280c13eb5951f96bc71a252819
parent b3f3762e

api/current.txt

+14 −0
Original line number Diff line number Diff line
@@ -12018,6 +12018,12 @@ package android.graphics.drawable { 
    method public int getId(int);

    method public int getLayerGravity(int);

    method public int getLayerHeight(int);

    method public int getLayerInsetBottom(int);

    method public int getLayerInsetEnd(int);

    method public int getLayerInsetLeft(int);

    method public int getLayerInsetRight(int);

    method public int getLayerInsetStart(int);

    method public int getLayerInsetTop(int);

    method public int getLayerWidth(int);

    method public int getNumberOfLayers();

    method public int getOpacity();
@@ -12030,9 +12036,17 @@ package android.graphics.drawable { 
    method public boolean setDrawableByLayerId(int, android.graphics.drawable.Drawable);

    method public void setId(int, int);

    method public void setLayerGravity(int, int);

    method public void setLayerHeight(int, int);

    method public void setLayerInset(int, int, int, int, int);

    method public void setLayerInsetBottom(int, int);

    method public void setLayerInsetEnd(int, int);

    method public void setLayerInsetLeft(int, int);

    method public void setLayerInsetRelative(int, int, int, int, int);

    method public void setLayerInsetRight(int, int);

    method public void setLayerInsetStart(int, int);

    method public void setLayerInsetTop(int, int);

    method public void setLayerSize(int, int, int);

    method public void setLayerWidth(int, int);

    method public void setOpacity(int);

    method public void setPaddingMode(int);

    method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);

api/system-current.txt

+14 −0
Original line number Diff line number Diff line
@@ -12292,6 +12292,12 @@ package android.graphics.drawable { 
    method public int getId(int);

    method public int getLayerGravity(int);

    method public int getLayerHeight(int);

    method public int getLayerInsetBottom(int);

    method public int getLayerInsetEnd(int);

    method public int getLayerInsetLeft(int);

    method public int getLayerInsetRight(int);

    method public int getLayerInsetStart(int);

    method public int getLayerInsetTop(int);

    method public int getLayerWidth(int);

    method public int getNumberOfLayers();

    method public int getOpacity();
@@ -12304,9 +12310,17 @@ package android.graphics.drawable { 
    method public boolean setDrawableByLayerId(int, android.graphics.drawable.Drawable);

    method public void setId(int, int);

    method public void setLayerGravity(int, int);

    method public void setLayerHeight(int, int);

    method public void setLayerInset(int, int, int, int, int);

    method public void setLayerInsetBottom(int, int);

    method public void setLayerInsetEnd(int, int);

    method public void setLayerInsetLeft(int, int);

    method public void setLayerInsetRelative(int, int, int, int, int);

    method public void setLayerInsetRight(int, int);

    method public void setLayerInsetStart(int, int);

    method public void setLayerInsetTop(int, int);

    method public void setLayerSize(int, int, int);

    method public void setLayerWidth(int, int);

    method public void setOpacity(int);

    method public void setPaddingMode(int);

    method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);

core/java/android/widget/AbsSeekBar.java

+2 −3
Original line number Diff line number Diff line
@@ -423,8 +423,8 @@ public abstract class AbsSeekBar extends ProgressBar { 
        }



        if (track != null) {

            track.setBounds(0, trackOffset, w - mPaddingRight - mPaddingLeft,

                    h - mPaddingBottom - trackOffset - mPaddingTop);

            final int trackWidth = w - mPaddingRight - mPaddingLeft;

            track.setBounds(0, trackOffset, trackWidth, trackOffset + trackHeight);

        }



        if (thumb != null) {
@@ -472,7 +472,6 @@ public abstract class AbsSeekBar extends ProgressBar { 


        final Drawable background = getBackground();

        if (background != null) {

            final Rect bounds = thumb.getBounds();

            final int offsetX = mPaddingLeft - mThumbOffset;

            final int offsetY = mPaddingTop;

            background.setHotspotBounds(left + offsetX, top + offsetY,

core/java/android/widget/ProgressBar.java

+37 −21
Original line number Diff line number Diff line
@@ -401,36 +401,49 @@ public class ProgressBar extends View { 
     * traverse layer and state list drawables.

     */

    private Drawable tileify(Drawable drawable, boolean clip) {

        // TODO: This is a terrible idea that potentially destroys any drawable

        // that extends any of these classes. We *really* need to remove this.



        if (drawable instanceof LayerDrawable) {

            LayerDrawable background = (LayerDrawable) drawable;

            final int N = background.getNumberOfLayers();

            Drawable[] outDrawables = new Drawable[N];

            final LayerDrawable orig = (LayerDrawable) drawable;

            final int N = orig.getNumberOfLayers();

            final Drawable[] outDrawables = new Drawable[N];



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

                int id = background.getId(i);

                outDrawables[i] = tileify(background.getDrawable(i),

                final int id = orig.getId(i);

                outDrawables[i] = tileify(orig.getDrawable(i),

                        (id == R.id.progress || id == R.id.secondaryProgress));

            }



            LayerDrawable newBg = new LayerDrawable(outDrawables);



            final LayerDrawable clone = new LayerDrawable(outDrawables);

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

                newBg.setId(i, background.getId(i));

                clone.setId(i, orig.getId(i));

                clone.setLayerGravity(i, orig.getLayerGravity(i));

                clone.setLayerWidth(i, orig.getLayerWidth(i));

                clone.setLayerHeight(i, orig.getLayerHeight(i));

                clone.setLayerInsetLeft(i, orig.getLayerInsetLeft(i));

                clone.setLayerInsetRight(i, orig.getLayerInsetRight(i));

                clone.setLayerInsetTop(i, orig.getLayerInsetTop(i));

                clone.setLayerInsetBottom(i, orig.getLayerInsetBottom(i));

                clone.setLayerInsetStart(i, orig.getLayerInsetStart(i));

                clone.setLayerInsetEnd(i, orig.getLayerInsetEnd(i));

            }



            return newBg;

            return clone;

        }



        } else if (drawable instanceof StateListDrawable) {

            StateListDrawable in = (StateListDrawable) drawable;

            StateListDrawable out = new StateListDrawable();

            int numStates = in.getStateCount();

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

        if (drawable instanceof StateListDrawable) {

            final StateListDrawable in = (StateListDrawable) drawable;

            final StateListDrawable out = new StateListDrawable();

            final int N = in.getStateCount();

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

                out.addState(in.getStateSet(i), tileify(in.getStateDrawable(i), clip));

            }



            return out;

        }



        } else if (drawable instanceof BitmapDrawable) {

        if (drawable instanceof BitmapDrawable) {

            final BitmapDrawable bitmap = (BitmapDrawable) drawable;

            final Bitmap tileBitmap = bitmap.getBitmap();

            if (mSampleTile == null) {
@@ -1680,20 +1693,23 @@ public class ProgressBar extends View { 


    @Override

    protected synchronized void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        Drawable d = mCurrentDrawable;



        int dw = 0;

        int dh = 0;



        final Drawable d = mCurrentDrawable;

        if (d != null) {

            dw = Math.max(mMinWidth, Math.min(mMaxWidth, d.getIntrinsicWidth()));

            dh = Math.max(mMinHeight, Math.min(mMaxHeight, d.getIntrinsicHeight()));

        }



        updateDrawableState();



        dw += mPaddingLeft + mPaddingRight;

        dh += mPaddingTop + mPaddingBottom;



        setMeasuredDimension(resolveSizeAndState(dw, widthMeasureSpec, 0),

                resolveSizeAndState(dh, heightMeasureSpec, 0));

        final int measuredWidth = resolveSizeAndState(dw, widthMeasureSpec, 0);

        final int measuredHeight = resolveSizeAndState(dh, heightMeasureSpec, 0);

        setMeasuredDimension(measuredWidth, measuredHeight);

    }



    @Override
@@ -1703,7 +1719,7 @@ public class ProgressBar extends View { 
    }



    private void updateDrawableState() {

        int[] state = getDrawableState();

        final int[] state = getDrawableState();



        if (mProgressDrawable != null && mProgressDrawable.isStateful()) {

            mProgressDrawable.setState(state);

core/res/res/color/white_disabled_material.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="@color/white"

          android:alpha="?attr/disabledAlpha" />

</selector>