diff options
| author | Youngsang Cho <youngsang@google.com> | 2014-07-18 03:31:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-17 18:11:21 +0000 |
| commit | 0b91f24c603151bf9e8b7d4387b9816fa6730a4c (patch) | |
| tree | e9610dfc4bbafd3334044a043d43826b98b90519 /src | |
| parent | 614b728890014324da71112d38e25a55f94b31e8 (diff) | |
| parent | fddf07d3be62c8817b82a1e6c7168210fe1ab46a (diff) | |
| download | TV-0b91f24c603151bf9e8b7d4387b9816fa6730a4c.tar.gz | |
Merge "Use Context for TvInputInfo.loadLabel/Icon instead of PackageManager" into lmp-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/tv/ui/ChannelBannerView.java | 2 | ||||
| -rw-r--r-- | src/com/android/tv/util/Utils.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/tv/ui/ChannelBannerView.java b/src/com/android/tv/ui/ChannelBannerView.java index a03d4385..255468c5 100644 --- a/src/com/android/tv/ui/ChannelBannerView.java +++ b/src/com/android/tv/ui/ChannelBannerView.java @@ -67,7 +67,7 @@ public class ChannelBannerView extends RelativeLayout implements Channel.LoadLog new LruCache<TvInputInfo, Drawable> (CACHE_SIZE) { @Override protected Drawable create(TvInputInfo info) { - return info.loadIcon(getContext().getPackageManager()); + return info.loadIcon(getContext()); } }; diff --git a/src/com/android/tv/util/Utils.java b/src/com/android/tv/util/Utils.java index e41331bc..a29df015 100644 --- a/src/com/android/tv/util/Utils.java +++ b/src/com/android/tv/util/Utils.java @@ -266,9 +266,8 @@ public class Utils { public static String getDisplayNameForInput(Context context, TvInputInfo info) { SharedPreferences preferences = getSharedPreferencesOfDisplayNameForInput(context); - PackageManager pm = context.getPackageManager(); return preferences.getString(TvSettings.PREF_DISPLAY_INPUT_NAME + info.getId(), - info.loadLabel(pm).toString()); + info.loadLabel(context).toString()); } public static boolean hasActivity(Context context, TvInputInfo input, String action) { |