Merge "[Panlingual] Use feature flag to switch opt-in on/off" into tm-dev (855099c7) · Commits · e / os / android_packages_apps_Settings

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

+67 −2

Original line number	Diff line number	Diff line
		@@ -18,11 +18,14 @@ package com.android.settings.applications;

		import android.annotation.NonNull;
		import android.app.ActivityManager;
		import android.app.LocaleConfig;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.PackageInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.os.LocaleList;
		import android.util.FeatureFlagUtils;
		import android.util.Log;

		import com.android.settings.R;
		@@ -46,12 +49,17 @@ public class AppLocaleUtil {
		boolean isDisallowedPackage = isDisallowedPackage(context, packageName);
		boolean hasLauncherEntry = hasLauncherEntry(packageName, infos);
		boolean isSignedWithPlatformKey = isSignedWithPlatformKey(context, packageName);
		boolean isAppLocaleSupported = isAppLocaleSupported(context, packageName);
		Log.i(TAG, "Can display preference - [" + packageName + "] :"
		+ " isDisallowedPackage : " + isDisallowedPackage
		+ " / isSignedWithPlatformKey : " + isSignedWithPlatformKey
		+ " / hasLauncherEntry : " + hasLauncherEntry);
		+ " / hasLauncherEntry : " + hasLauncherEntry
		+ " / isAppLocaleSupported : " + isAppLocaleSupported);

		return !isDisallowedPackage && !isSignedWithPlatformKey && hasLauncherEntry;
		return !isDisallowedPackage
		&& !isSignedWithPlatformKey
		&& hasLauncherEntry
		&& isAppLocaleSupported;
		}

		private static boolean isDisallowedPackage(Context context, String packageName) {
		@@ -86,4 +94,61 @@ public class AppLocaleUtil {
		return infos.stream()
		.anyMatch(info -> info.activityInfo.packageName.equals(packageName));
		}

		/**
		* Check the function of per app language is supported by current application.
		*/
		public static boolean isAppLocaleSupported(Context context, String packageName) {
		if (getPackageLocales(context, packageName) != null) {
		return true;
		}

		if (FeatureFlagUtils.isEnabled(
		context, FeatureFlagUtils.SETTINGS_APP_LOCALE_OPT_IN_ENABLED)) {
		return false;
		}

		return getAssetLocales(context, packageName).length > 0;
		}

		/**
		* Get locales fron AssetManager.
		*/
		public static String[] getAssetLocales(Context context, String packageName) {
		try {
		PackageManager packageManager = context.getPackageManager();
		String[] locales = packageManager.getResourcesForApplication(
		packageManager.getPackageInfo(packageName, PackageManager.MATCH_ALL)
		.applicationInfo).getAssets().getNonSystemLocales();
		if (locales == null) {
		Log.i(TAG, "[" + packageName + "] locales are null.");
		}
		if (locales.length <= 0) {
		Log.i(TAG, "[" + packageName + "] locales length is 0.");
		return new String[0];
		}
		String locale = locales[0];
		Log.i(TAG, "First asset locale - [" + packageName + "] " + locale);
		return locales;
		} catch (PackageManager.NameNotFoundException e) {
		Log.w(TAG, "Can not found the package name : " + packageName + " / " + e);
		}
		return new String[0];
		}

		/**
		* Get locales from LocaleConfig.
		*/
		public static LocaleList getPackageLocales(Context context, String packageName) {
		try {
		LocaleConfig localeConfig =
		new LocaleConfig(context.createPackageContext(packageName, 0));
		if (localeConfig.getStatus() == LocaleConfig.STATUS_SUCCESS) {
		return localeConfig.getSupportedLocales();
		}
		} catch (PackageManager.NameNotFoundException e) {
		Log.w(TAG, "Can not found the package name : " + packageName + " / " + e);
		}
		return null;
		}
		}

src/com/android/settings/applications/appinfo/AppLocaleDetails.java

+3 −38

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.settings.applications.appinfo;
		import static com.android.settings.widget.EntityHeaderController.ActionType;

		import android.app.Activity;
		import android.app.LocaleConfig;
		import android.app.LocaleManager;
		import android.app.settings.SettingsEnums;
		import android.content.Context;
		@@ -44,6 +43,7 @@ import com.android.settings.R;
		import com.android.settings.SettingsPreferenceFragment;
		import com.android.settings.Utils;
		import com.android.settings.applications.AppInfoBase;
		import com.android.settings.applications.AppLocaleUtil;
		import com.android.settings.widget.EntityHeaderController;
		import com.android.settingslib.applications.AppUtils;
		import com.android.settingslib.applications.ApplicationsState.AppEntry;
		@@ -206,8 +206,8 @@ public class AppLocaleDetails extends SettingsPreferenceFragment {
		}

		private int getAppDescription() {
		LocaleList packageLocaleList = getPackageLocales();
		String[] assetLocaleList = getAssetLocales();
		LocaleList packageLocaleList = AppLocaleUtil.getPackageLocales(getContext(), mPackageName);
		String[] assetLocaleList = AppLocaleUtil.getAssetLocales(getContext(), mPackageName);
		// TODO add apended url string, "Learn more", to these both sentenses.
		if ((packageLocaleList != null && packageLocaleList.isEmpty())
		\|\| (packageLocaleList == null && assetLocaleList.length == 0)) {
		@@ -216,41 +216,6 @@ public class AppLocaleDetails extends SettingsPreferenceFragment {
		return -1;
		}

		private String[] getAssetLocales() {
		try {
		PackageManager packageManager = getContext().getPackageManager();
		String[] locales = packageManager.getResourcesForApplication(
		packageManager.getPackageInfo(mPackageName, PackageManager.MATCH_ALL)
		.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) {
		Log.w(TAG, "Can not found the package name : " + mPackageName + " / " + e);
		}
		return new String[0];
		}

		private LocaleList getPackageLocales() {
		try {
		LocaleConfig localeConfig =
		new LocaleConfig(getContext().createPackageContext(mPackageName, 0));
		if (localeConfig.getStatus() == LocaleConfig.STATUS_SUCCESS) {
		return localeConfig.getSupportedLocales();
		}
		} catch (PackageManager.NameNotFoundException e) {
		Log.w(TAG, "Can not found the package name : " + mPackageName + " / " + e);
		}
		return null;
		}

		/** Gets per app's default locale */
		public static Locale getAppDefaultLocale(Context context, String packageName) {
		LocaleManager localeManager = context.getSystemService(LocaleManager.class);

tests/unit/src/com/android/settings/applications/AppLocaleUtilTest.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import androidx.test.core.app.ApplicationProvider;
		import androidx.test.ext.junit.runners.AndroidJUnit4;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		@@ -71,6 +72,7 @@ public class AppLocaleUtilTest {
		}

		@Test
		@Ignore("b/231904717")
		public void canDisplayLocaleUi_showUI() throws PackageManager.NameNotFoundException {
		setApplicationInfo(/no platform key/ false);
		setActivityInfo(mAllowedPackage);
		@@ -79,6 +81,7 @@ public class AppLocaleUtilTest {
		}

		@Test
		@Ignore("b/231904717")
		public void canDisplayLocaleUi_notShowUI_hasPlatformKey()
		throws PackageManager.NameNotFoundException {
		setApplicationInfo(/has platform key/ true);
		@@ -88,6 +91,7 @@ public class AppLocaleUtilTest {
		}

		@Test
		@Ignore("b/231904717")
		public void canDisplayLocaleUi_notShowUI_noLauncherEntry()
		throws PackageManager.NameNotFoundException {
		setApplicationInfo(/no platform key/false);
		@@ -97,6 +101,7 @@ public class AppLocaleUtilTest {
		}

		@Test
		@Ignore("b/231904717")
		public void canDisplayLocaleUi_notShowUI_matchDisallowedPackageList()
		throws PackageManager.NameNotFoundException {
		setApplicationInfo(/no platform key/false);