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

Pass in context when loading icons from Tile

Browse Source 
Bug: 111860183
Test: robotests
Change-Id: I836ad66eb420f4e0bd0bbded541f4dfe947c9b18
This commit is contained in:
Fan Zhang
2018-07-26 11:26:11 -07:00
parent 4329792198
commit 1c61a58f0d
6 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
View File

@@ -34,6 +34,9 @@ import android.util.ArrayMap;
import android.util.Log;
import android.util.Pair;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -50,9 +53,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
/**
* Impl for {@code DashboardFeatureProvider}.
*/
@@ -238,7 +238,7 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
@VisibleForTesting
void bindIcon(Preference preference, Tile tile) {
final Icon tileIcon = tile.getIcon();
final Icon tileIcon = tile.getIcon(mContext);
if (tileIcon != null) {
preference.setIcon(tileIcon.loadDrawable(preference.getContext()));
} else if (tile.metaData != null