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

Merge "[Panlingual] Adds log and have small refactor."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-24 17:08:44 +00:00
committed by Android (Google) Code Review
parent 6a663c3dff f2613fc56b
commit 139331e47f
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/applications/AppLocaleUtil.java
View File

@@ -42,9 +42,15 @@ public class AppLocaleUtil {
@NonNull Context context, @NonNull Context context,
@NonNull String packageName, @NonNull String packageName,
@NonNull List<ResolveInfo> infos) { @NonNull List<ResolveInfo> infos) {
return !isDisallowedPackage(context, packageName) boolean isDisallowedPackage = isDisallowedPackage(context, packageName);
&& !isSignedWithPlatformKey(context, packageName) boolean hasLauncherEntry = hasLauncherEntry(packageName, infos);
&& hasLauncherEntry(packageName, infos); boolean isSignedWithPlatformKey = isSignedWithPlatformKey(context, packageName);
Log.i(TAG, "Can display preference - [" + packageName + "] :"
+ " isDisallowedPackage : " + isDisallowedPackage
+ " / isSignedWithPlatformKey : " + isSignedWithPlatformKey
+ " / hasLauncherEntry : " + hasLauncherEntry);
return !isDisallowedPackage && !isSignedWithPlatformKey && hasLauncherEntry;
} }
private static boolean isDisallowedPackage(Context context, String packageName) { private static boolean isDisallowedPackage(Context context, String packageName) {

13
src/com/android/settings/applications/appinfo/AppLocaleDetails.java
View File

@@ -325,7 +325,6 @@ public class AppLocaleDetails extends AppInfoBase implements RadioButtonPreferen
@VisibleForTesting @VisibleForTesting
void handleSupportedLocales() { void handleSupportedLocales() {
mProcessedSupportedLocales.addAll(mAppSupportedLocales); mProcessedSupportedLocales.addAll(mAppSupportedLocales);
if (mProcessedSuggestedLocales != null || !mProcessedSuggestedLocales.isEmpty()) { if (mProcessedSuggestedLocales != null || !mProcessedSuggestedLocales.isEmpty()) {
mProcessedSuggestedLocales.retainAll(mProcessedSupportedLocales); mProcessedSuggestedLocales.retainAll(mProcessedSupportedLocales);
mProcessedSupportedLocales.removeAll(mProcessedSuggestedLocales); mProcessedSupportedLocales.removeAll(mProcessedSuggestedLocales);
@@ -399,9 +398,19 @@ public class AppLocaleDetails extends AppInfoBase implements RadioButtonPreferen
String[] getAssetLocales() { String[] getAssetLocales() {
try { try {
PackageManager packageManager = mContext.getPackageManager(); PackageManager packageManager = mContext.getPackageManager();
return packageManager.getResourcesForApplication( String[] locales = packageManager.getResourcesForApplication(
packageManager.getPackageInfo(mPackageName, PackageManager.MATCH_ALL) packageManager.getPackageInfo(mPackageName, PackageManager.MATCH_ALL)
.applicationInfo).getAssets().getNonSystemLocales(); .applicationInfo).getAssets().getNonSystemLocales();
if (locales == null) {
Log.i(TAG, "[" + mPackageName + "] locales are null.");
}
if (locales.length <= 0) {
Log.i(TAG, "[" + mPackageName + "] locales length is 0.");
return new String[0];
}
String locale = locales[0];
Log.i(TAG, "First asset locale - [" + mPackageName + "] " + locale);
return locales;
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, "Can not found the package name : " + mPackageName + " / " + e); Log.w(TAG, "Can not found the package name : " + mPackageName + " / " + e);
} }