Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Properly store values to pass to constant state" into sc-v2-dev am: 67c9b400fb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897188

Change-Id: I8505100246d9408759fb263d6af80db17b98b09b
This commit is contained in:
TreeHugger Robot
2021-09-24 17:25:58 +00:00
committed by Automerger Merge Worker
parent 4eac028611 67c9b400fb
commit 6298e48132
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/util/AlphaTintDrawableWrapper.java
View File

@@ -109,6 +109,12 @@ public class AlphaTintDrawableWrapper extends InsetDrawable {
} }
} }
@Override
public void setTintList(ColorStateList tint) {
super.setTintList(tint);
mTint = tint;
}
private void applyTint() { private void applyTint() {
if (getDrawable() != null && mTint != null) { if (getDrawable() != null && mTint != null) {
getDrawable().mutate().setTintList(mTint); getDrawable().mutate().setTintList(mTint);

8
packages/SystemUI/src/com/android/systemui/util/RoundedCornerProgressDrawable.kt
View File

@@ -69,6 +69,10 @@ class RoundedCornerProgressDrawable @JvmOverloads constructor(
return super.getChangingConfigurations() or ActivityInfo.CONFIG_DENSITY return super.getChangingConfigurations() or ActivityInfo.CONFIG_DENSITY
} }
override fun canApplyTheme(): Boolean {
return (drawable?.canApplyTheme() ?: false) || super.canApplyTheme()
}
private class RoundedCornerState(private val wrappedState: ConstantState) : ConstantState() { private class RoundedCornerState(private val wrappedState: ConstantState) : ConstantState() {
override fun newDrawable(): Drawable { override fun newDrawable(): Drawable {
return newDrawable(null, null) return newDrawable(null, null)
@@ -82,5 +86,9 @@ class RoundedCornerProgressDrawable @JvmOverloads constructor(
override fun getChangingConfigurations(): Int { override fun getChangingConfigurations(): Int {
return wrappedState.changingConfigurations return wrappedState.changingConfigurations
} }
override fun canApplyTheme(): Boolean {
return true
}
} }
} }