Merge "Use safe icon when building unavailable slices."

2018-11-01 19:13:37 +00:00
parent 08f677d9e0 f535055e2e
commit 303fd8cc1a
11 changed files with 24 additions and 5 deletions
--- a/src/com/android/settings/slices/SliceDataConverter.java
+++ b/src/com/android/settings/slices/SliceDataConverter.java
@@ -277,7 +277,7 @@ class SliceDataConverter {
            final String title = resolveInfo.loadLabel(packageManager).toString();
            int iconResource = resolveInfo.getIconResource();
            if (iconResource == 0) {
-                iconResource = R.mipmap.ic_accessibility_generic;
+                iconResource = R.drawable.ic_accessibility_generic;
            }

            sliceDataBuilder.setKey(flattenedName)