Jonathan Miranda 7e8b2742c9 resolve merge conflicts of 11bf817e86 to sc-v2-dev ...

Bug: 190210234
Bug: 190164147
Test: manual

Change-Id: I155ee7efdbda10c05f87001ac4eaf07017a6d456
Merged-In: I230c33d7e4e1871d8d702737c56c79ce46504b8f

2021-06-14 20:32:58 +00:00

..

attrs.xml

Icon sizes/ keyline / font for AA+ results

2021-06-04 01:43:40 -07:00

colors.xml

Folder polish - update color extraction, fix contrast issues.

2021-06-14 17:54:19 +00:00

config.xml

Adding color back to popup container.

2021-06-10 19:15:24 +00:00

dimens.xml

Merge "Introduce inline education for work profile" into sc-dev am: b8b822a74b

2021-06-14 19:34:04 +00:00

id.xml

Catch NPE for AllAppsContainerView.dispatchRestoreInstanceState

2021-05-17 00:47:28 -07:00

strings.xml

Introduce inline education for work profile

2021-06-14 01:01:42 -05:00

styles.xml

resolve merge conflicts of 11bf817e86 to sc-v2-dev

2021-06-14 20:32:58 +00:00