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

Merge "Misc ui tweaks."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-13 02:15:54 +00:00
committed by Android (Google) Code Review
parent 545f8b1454 07207c0113
commit d611df7c48
23 changed files with 113 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -449,14 +449,14 @@ public class SliceBuilderUtils {
int iconResource = data.getIconResource();
if (iconResource == 0) {
iconResource = R.drawable.ic_settings;
iconResource = R.drawable.ic_settings_accent;
}
try {
return IconCompat.createWithResource(context, iconResource);
} catch (Exception e) {
Log.w(TAG, "Falling back to settings icon because there is an error getting slice icon "
+ data.getUri(), e);
return IconCompat.createWithResource(context, R.drawable.ic_settings);
return IconCompat.createWithResource(context, R.drawable.ic_settings_accent);
}
}
}

2
src/com/android/settings/wifi/slice/WifiSlice.java
View File

@@ -159,7 +159,7 @@ public class WifiSlice implements CustomSliceable {
private IconCompat getEndIcon(AccessPoint accessPoint) {
if (accessPoint.isActive()) {
return IconCompat.createWithResource(mContext, R.drawable.ic_settings);
return IconCompat.createWithResource(mContext, R.drawable.ic_settings_accent);
} else if (accessPoint.getSecurity() != AccessPoint.SECURITY_NONE) {
return IconCompat.createWithResource(mContext, R.drawable.ic_friction_lock_closed);
} else if (accessPoint.isMetered()) {