PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use safe icon when building unavailable slices."

Browse Source
This commit is contained in:
Fan Zhang
2018-11-01 19:13:37 +00:00
committed by Android (Google) Code Review
parent 08f677d9e0 f535055e2e
commit 303fd8cc1a
11 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -550,7 +550,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
Drawable icon;
if (resolveInfo.getIconResource() == 0) {
icon = ContextCompat.getDrawable(getContext(), R.mipmap.ic_accessibility_generic);
icon = ContextCompat.getDrawable(getContext(), R.drawable.ic_accessibility_generic);
} else {
icon = resolveInfo.loadIcon(getPackageManager());
}

2
src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
View File

@@ -258,7 +258,7 @@ public class ShortcutServicePickerFragment extends RadioButtonPickerFragment {
public Drawable loadIcon() {
final ResolveInfo resolveInfo = mServiceInfo.getResolveInfo();
return (resolveInfo.getIconResource() == 0)
? getContext().getDrawable(R.mipmap.ic_accessibility_generic)
? getContext().getDrawable(R.drawable.ic_accessibility_generic)
: resolveInfo.loadIcon(getContext().getPackageManager());
}

2
src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java
View File

@@ -43,7 +43,7 @@ public class SettingsContextualCardProvider extends ContextualCardProvider {
.build();
final ContextualCard batteryInfoCard =
ContextualCard.newBuilder()
.setSliceUri(BatterySlice.BATTERY_CARD_URI.toSafeString())
.setSliceUri(BatterySlice.BATTERY_CARD_URI.toString())
.setCardName(BatterySlice.PATH_BATTERY_INFO)
.build();
final ContextualCard connectedDeviceCard =

2
src/com/android/settings/slices/SliceBuilderUtils.java
View File

@@ -385,7 +385,7 @@ public class SliceBuilderUtils {
final Set<String> keywords = buildSliceKeywords(data);
@ColorInt final int color = Utils.getColorAccentDefaultColor(context);
final CharSequence summary = context.getText(R.string.disabled_dependent_setting_summary);
final IconCompat icon = IconCompat.createWithResource(context, data.getIconResource());
final IconCompat icon = getSafeIcon(context, data);
final SliceAction primaryAction = new SliceAction(getContentPendingIntent(context, data),
icon, title);

2
src/com/android/settings/slices/SliceDataConverter.java
View File

@@ -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)