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

[Panlingual] Fix conflict am: 70fe2d1fdd am: c4603be5b3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I8154923e9e3db1e4984889d648cf0cfa17e65348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tom Hsu
2022-05-05 09:26:43 +00:00
committed by Automerger Merge Worker
parent 62715a9cdd c4603be5b3
commit e74b7edb7c
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@ public class AppLocaleUtil {
public static final Intent LAUNCHER_ENTRY_INTENT = public static final Intent LAUNCHER_ENTRY_INTENT =
new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER); new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER);
/** /**
* Decides the UI display of per app locale. * Decides the UI display of per app locale.
*/ */
@@ -42,9 +43,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) {