commit 31bd81307346a0f935aa563ef2e4f606c34c61ff
author Joseph Johnson <simplex@google.com> Thu Sep 21 16:17:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 21 16:17:23 2017 +0000
tree d0868d55add177377716a98b6331c4d3defa59e8
parent 72293538919cf11de75e92d32748f547c8968f1f
parent 4e1b8feb5f34ce6f54feb3fa1d9e2ba0d50e7cd4

Load icon and title from Google ActivityInfo
am: 4e1b8feb5f

Change-Id: I74507308a9f07bfeb6d952ae7b26293de4ffaa80

Settings/src/com/android/tv/settings/MainFragment.java

diff --git a/Settings/src/com/android/tv/settings/MainFragment.java b/Settings/src/com/android/tv/settings/MainFragment.java
index 9d61b62..a48a734 100644
--- a/Settings/src/com/android/tv/settings/MainFragment.java
+++ b/Settings/src/com/android/tv/settings/MainFragment.java
@@ -445,16 +445,11 @@
             final ResolveInfo info = systemIntentIsHandled(getContext(),
                     googleSettingsPref.getIntent());
             googleSettingsPref.setVisible(info != null);
-            if (info != null) {
-                try {
-                    final Context targetContext = getContext()
-                            .createPackageContext(info.resolvePackageName != null ?
-                                    info.resolvePackageName : info.activityInfo.packageName, 0);
-                    googleSettingsPref.setIcon(targetContext.getDrawable(info.iconResourceId));
-                } catch (Resources.NotFoundException | PackageManager.NameNotFoundException
-                        | SecurityException e) {
-                    Log.e(TAG, "Google settings icon not found", e);
-                }
+            if (info != null && info.activityInfo != null) {
+                googleSettingsPref.setIcon(
+                    info.activityInfo.loadIcon(getContext().getPackageManager()));
+                googleSettingsPref.setTitle(
+                    info.activityInfo.loadLabel(getContext().getPackageManager()));
             }
 
             final Preference speechPref = findPreference(KEY_SPEECH_SETTINGS);