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

Commit 24192c80 authored by Ember Rose's avatar Ember Rose
Browse files

Add nullability annotations to ColorStateListDrawable 

Test: Annotation-only change, exsiting tests still pass
Change-Id: I34d56679658045aa57b93cfd6ad77b2859ce224a
Fix: 126701617
Fix: 126701492
parent b1011334

api/current.txt

+7 −7
Original line number Diff line number Diff line
@@ -15273,18 +15273,18 @@ package android.graphics.drawable { 














  public class ColorStateListDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {















    ctor public ColorStateListDrawable();













    ctor public ColorStateListDrawable(android.content.res.ColorStateList);













    ctor public ColorStateListDrawable(@NonNull android.content.res.ColorStateList);















    method public void clearAlpha();













    method public void draw(android.graphics.Canvas);













    method public void draw(@NonNull android.graphics.Canvas);















    method @NonNull public android.content.res.ColorStateList getColorStateList();















    method public int getOpacity();















    method public boolean hasFocusStateSpecified();













    method public void invalidateDrawable(android.graphics.drawable.Drawable);













    method public void scheduleDrawable(android.graphics.drawable.Drawable, Runnable, long);













    method public void invalidateDrawable(@NonNull android.graphics.drawable.Drawable);













    method public void scheduleDrawable(@NonNull android.graphics.drawable.Drawable, @NonNull Runnable, long);















    method public void setAlpha(@IntRange(from=0, to=255) int);













    method public void setColorFilter(android.graphics.ColorFilter);













    method public void setColorStateList(android.content.res.ColorStateList);













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













    method public void setColorFilter(@Nullable android.graphics.ColorFilter);













    method public void setColorStateList(@NonNull android.content.res.ColorStateList);













    method public void unscheduleDrawable(@NonNull android.graphics.drawable.Drawable, @NonNull Runnable);















  }





























  public abstract class Drawable {

























graphics/java/android/graphics/drawable/ColorStateListDrawable.java



+15
−14




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@ package android.graphics.drawable;





























import android.annotation.IntRange;















import android.annotation.NonNull;













import android.annotation.Nullable;















import android.content.pm.ActivityInfo;















import android.content.res.ColorStateList;















import android.content.res.Resources;









@@ -40,14 +41,14 @@ public class ColorStateListDrawable extends Drawable implements Drawable.Callbac













        initializeColorDrawable();















    }





























    public ColorStateListDrawable(ColorStateList colorStateList) {













    public ColorStateListDrawable(@NonNull ColorStateList colorStateList) {















        mState = new ColorStateListDrawableState();















        initializeColorDrawable();















        setColorStateList(colorStateList);















    }































    @Override













    public void draw(Canvas canvas) {













    public void draw(@NonNull Canvas canvas) {















        mColorDrawable.draw(canvas);















    }

























@@ -73,7 +74,7 @@ public class ColorStateListDrawable extends Drawable implements Drawable.Callbac













    }































    @Override













    public void applyTheme(Resources.Theme t) {













    public void applyTheme(@NonNull Resources.Theme t) {















        super.applyTheme(t);































        if (mState.mColor != null) {










@@ -106,26 +107,26 @@ public class ColorStateListDrawable extends Drawable implements Drawable.Callbac













    }































    @Override













    public void setTintList(ColorStateList tint) {













    public void setTintList(@Nullable ColorStateList tint) {















        mState.mTint = tint;















        mColorDrawable.setTintList(tint);















        onStateChange(getState());















    }































    @Override













    public void setTintMode(PorterDuff.Mode tintMode) {













    public void setTintMode(@NonNull PorterDuff.Mode tintMode) {















        mState.mTintMode = tintMode;















        mColorDrawable.setTintMode(tintMode);















        onStateChange(getState());















    }































    @Override













    public ColorFilter getColorFilter() {













    public @Nullable ColorFilter getColorFilter() {















        return mColorDrawable.getColorFilter();















    }































    @Override













    public void setColorFilter(ColorFilter colorFilter) {













    public void setColorFilter(@Nullable ColorFilter colorFilter) {















        mColorDrawable.setColorFilter(colorFilter);















    }


























@@ -156,28 +157,28 @@ public class ColorStateListDrawable extends Drawable implements Drawable.Callbac













    }































    @Override













    public void invalidateDrawable(Drawable who) {













    public void invalidateDrawable(@NonNull Drawable who) {















        if (who == mColorDrawable && getCallback() != null) {















            getCallback().invalidateDrawable(this);















        }















    }































    @Override













    public void scheduleDrawable(Drawable who, Runnable what, long when) {













    public void scheduleDrawable(@NonNull Drawable who, @NonNull Runnable what, long when) {















        if (who == mColorDrawable && getCallback() != null) {















            getCallback().scheduleDrawable(this, what, when);















        }















    }































    @Override













    public void unscheduleDrawable(Drawable who, Runnable what) {













    public void unscheduleDrawable(@NonNull Drawable who, @NonNull Runnable what) {















        if (who == mColorDrawable && getCallback() != null) {















            getCallback().unscheduleDrawable(this, what);















        }















    }































    @Override













    public ConstantState getConstantState() {













    public @NonNull ConstantState getConstantState() {















        mState.mChangingConfigurations = mState.mChangingConfigurations















                | (getChangingConfigurations() & ~mState.getChangingConfigurations());















        return mState;









@@ -203,7 +204,7 @@ public class ColorStateListDrawable extends Drawable implements Drawable.Callbac













    }































    @Override













    public Drawable mutate() {













    public @NonNull Drawable mutate() {















        if (!mMutated && super.mutate() == this) {















            mState = new ColorStateListDrawableState(mState);















            mMutated = true;









@@ -226,7 +227,7 @@ public class ColorStateListDrawable extends Drawable implements Drawable.Callbac













     *















     * @param colorStateList A color state list to attach.















     */













    public void setColorStateList(ColorStateList colorStateList) {













    public void setColorStateList(@NonNull ColorStateList colorStateList) {















        mState.mColor = colorStateList;















        onStateChange(getState());















    }










@@ -278,7 +279,7 @@ public class ColorStateListDrawable extends Drawable implements Drawable.Callbac













        }















    }





























    private ColorStateListDrawable(ColorStateListDrawableState state) {













    private ColorStateListDrawable(@NonNull ColorStateListDrawableState state) {















        mState = state;















        initializeColorDrawable();















    }