Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70fe2d1f authored by Tom Hsu's avatar Tom Hsu
Browse files

[Panlingual] Fix conflict 

 - sync code from master to tm-dev

Change-Id: I75b66cd2fa161a6e7c8a9d272b67516ac55e7025
parent 74b1027f

src/com/android/settings/applications/AppLocaleUtil.java

+10 −3
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ public class AppLocaleUtil { 


    public static final Intent LAUNCHER_ENTRY_INTENT =

            new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER);



    /**

     * Decides the UI display of per app locale.

     */
@@ -42,9 +43,15 @@ public class AppLocaleUtil { 
            @NonNull Context context,

            @NonNull String packageName,

            @NonNull List<ResolveInfo> infos) {

        return !isDisallowedPackage(context, packageName)

                && !isSignedWithPlatformKey(context, packageName)

                && hasLauncherEntry(packageName, infos);

        boolean isDisallowedPackage = isDisallowedPackage(context, packageName);

        boolean hasLauncherEntry = 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) {