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

Merge "Let Settings app use InputMethodInfo#loadIcon()" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-30 18:31:13 +00:00
committed by Android (Google) Code Review
parent 2740c4a052 8cb387adae
commit 104906b344
2 changed files with 2 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
View File

@@ -16,20 +16,11 @@
package com.android.settings.inputmethod;
import android.annotation.DrawableRes;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
import android.content.res.Configuration;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import android.view.inputmethod.InputMethodInfo;
@@ -93,59 +84,12 @@ public final class AvailableVirtualKeyboardFragment extends SettingsPreferenceFr
return SettingsEnums.ENABLE_VIRTUAL_KEYBOARDS;
}
@Nullable
private static Drawable loadDrawable(@NonNull final PackageManager packageManager,
@NonNull final String packageName, @DrawableRes final int resId,
@NonNull final ApplicationInfo applicationInfo) {
if (resId == 0) {
return null;
}
try {
return packageManager.getDrawable(packageName, resId, applicationInfo);
} catch (Exception e) {
return null;
}
}
@NonNull
private static Drawable getInputMethodIcon(@NonNull final PackageManager packageManager,
@NonNull final InputMethodInfo imi) {
final ServiceInfo si = imi.getServiceInfo();
final ApplicationInfo ai = si != null ? si.applicationInfo : null;
final String packageName = imi.getPackageName();
if (si == null || ai == null || packageName == null) {
return new ColorDrawable(Color.TRANSPARENT);
}
// We do not use ServiceInfo#loadLogo() and ServiceInfo#loadIcon here since those methods
// internally have some fallback rules, which we want to do manually.
Drawable drawable = loadDrawable(packageManager, packageName, si.logo, ai);
if (drawable != null) {
return drawable;
}
drawable = loadDrawable(packageManager, packageName, si.icon, ai);
if (drawable != null) {
return drawable;
}
// We do not use ApplicationInfo#loadLogo() and ApplicationInfo#loadIcon here since those
// methods internally have some fallback rules, which we want to do manually.
drawable = loadDrawable(packageManager, packageName, ai.logo, ai);
if (drawable != null) {
return drawable;
}
drawable = loadDrawable(packageManager, packageName, ai.icon, ai);
if (drawable != null) {
return drawable;
}
return new ColorDrawable(Color.TRANSPARENT);
}
private void updateInputMethodPreferenceViews() {
mInputMethodSettingValues.refreshAllInputMethodAndSubtypes();
// Clear existing "InputMethodPreference"s
mInputMethodPreferenceList.clear();
List<String> permittedList = mDpm.getPermittedInputMethodsForCurrentUser();
final Context context = getPrefContext();
final PackageManager packageManager = getActivity().getPackageManager();
final List<InputMethodInfo> imis = mInputMethodSettingValues.getInputMethodList();
final int numImis = (imis == null ? 0 : imis.size());
for (int i = 0; i < numImis; ++i) {
@@ -154,7 +98,7 @@ public final class AvailableVirtualKeyboardFragment extends SettingsPreferenceFr
|| permittedList.contains(imi.getPackageName());
final InputMethodPreference pref = new InputMethodPreference(
context, imi, true, isAllowedByOrganization, this);
pref.setIcon(getInputMethodIcon(packageManager, imi));
pref.setIcon(imi.loadIcon(context.getPackageManager()));
mInputMethodPreferenceList.add(pref);
}
final Collator collator = Collator.getInstance();

12
src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
View File

@@ -20,8 +20,6 @@ import android.app.Activity;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
@@ -48,7 +46,6 @@ import java.util.List;
public final class VirtualKeyboardFragment extends SettingsPreferenceFragment implements Indexable {
private static final String ADD_VIRTUAL_KEYBOARD_SCREEN = "add_virtual_keyboard_screen";
private static final Drawable NO_ICON = new ColorDrawable(Color.TRANSPARENT);
private final ArrayList<InputMethodPreference> mInputMethodPreferenceList = new ArrayList<>();
private InputMethodManager mImm;
@@ -89,14 +86,7 @@ public final class VirtualKeyboardFragment extends SettingsPreferenceFragment im
final InputMethodInfo imi = imis.get(i);
final boolean isAllowedByOrganization = permittedList == null
|| permittedList.contains(imi.getPackageName());
Drawable icon;
try {
// TODO: Consider other ways to retrieve an icon to show here.
icon = getActivity().getPackageManager().getApplicationIcon(imi.getPackageName());
} catch (Exception e) {
// TODO: Consider handling the error differently perhaps by showing default icons.
icon = NO_ICON;
}
final Drawable icon = imi.loadIcon(context.getPackageManager());
final InputMethodPreference pref = new InputMethodPreference(
context,
imi,