Merge "Use staging-public-group in framework SDK" into sc-dev am: d4f0220d29

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

Change-Id: Id2b353a9d717daa7648f274d93198e7004a4a054
This commit is contained in:
Ryan Mitchell
2021-04-01 18:47:36 +00:00
committed by Automerger Merge Worker
8 changed files with 180 additions and 154 deletions

View File

@@ -376,10 +376,13 @@ public class ColorStateList extends ComplexColor implements Parcelable {
int[] stateSpec = new int[numAttrs];
for (int i = 0; i < numAttrs; i++) {
final int stateResId = attrs.getAttributeNameResource(i);
if (stateResId == R.attr.lStar) {
// Non-finalized resource ids cannot be used in switch statements.
continue;
}
switch (stateResId) {
case R.attr.color:
case R.attr.alpha:
case R.attr.lStar:
// Recognized attribute, ignore.
break;
default: