From ea9e627c1cfddc8a7620550d0f77c5271b8288d2 Mon Sep 17 00:00:00 2001 From: tom hsu Date: Tue, 15 Feb 2022 18:55:49 +0800 Subject: [PATCH] [Panlingual] Improve UI can not show on at first. - Settings take much time to get the info of app launcher entry. User may not see the panlingual UI at first after boot to home. - Does small refactor to somewhere. Bug: 218416193 Test: local Test: atest pass Change-Id: Ibfb91f0bb8d8ff54cadd041250b3cff252dbe591 (cherry picked from commit cae20ce2f7db52a086bdbacd3fe50d14ea0902e4) Merged-In: Ibfb91f0bb8d8ff54cadd041250b3cff252dbe591 --- .../settings/applications/AppLocaleUtil.java | 24 +++++-- .../applications/AppStateLocaleBridge.java | 14 ++-- .../AppLocalePreferenceController.java | 14 +++- .../manageapplications/AppFilterRegistry.java | 2 +- .../applications/AppLocaleUtilTest.java | 71 ++++++++++--------- 5 files changed, 78 insertions(+), 47 deletions(-) diff --git a/src/com/android/settings/applications/AppLocaleUtil.java b/src/com/android/settings/applications/AppLocaleUtil.java index e795b015792..700437774da 100644 --- a/src/com/android/settings/applications/AppLocaleUtil.java +++ b/src/com/android/settings/applications/AppLocaleUtil.java @@ -16,26 +16,35 @@ package com.android.settings.applications; +import android.annotation.NonNull; import android.app.ActivityManager; 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.util.Log; import com.android.settings.R; -import com.android.settingslib.applications.ApplicationsState.AppEntry; + +import java.util.List; /** This class provides methods that help dealing with per app locale. */ public class AppLocaleUtil { private static final String TAG = AppLocaleUtil.class.getSimpleName(); + public static final Intent LAUNCHER_ENTRY_INTENT = + new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER); /** * Decides the UI display of per app locale. */ - public static boolean canDisplayLocaleUi(Context context, AppEntry app) { - return !isDisallowedPackage(context, app.info.packageName) - && !isSignedWithPlatformKey(context, app.info.packageName) - && app.hasLauncherEntry; + public static boolean canDisplayLocaleUi( + @NonNull Context context, + @NonNull String packageName, + @NonNull List infos) { + return !isDisallowedPackage(context, packageName) + && !isSignedWithPlatformKey(context, packageName) + && hasLauncherEntry(packageName, infos); } private static boolean isDisallowedPackage(Context context, String packageName) { @@ -65,4 +74,9 @@ public class AppLocaleUtil { } return packageInfo.applicationInfo.isSignedWithPlatformKey(); } + + private static boolean hasLauncherEntry(String packageName, List infos) { + return infos.stream() + .anyMatch(info -> info.activityInfo.packageName.equals(packageName)); + } } diff --git a/src/com/android/settings/applications/AppStateLocaleBridge.java b/src/com/android/settings/applications/AppStateLocaleBridge.java index ebaf4abdea7..560076658ed 100644 --- a/src/com/android/settings/applications/AppStateLocaleBridge.java +++ b/src/com/android/settings/applications/AppStateLocaleBridge.java @@ -16,6 +16,8 @@ package com.android.settings.applications; import android.content.Context; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.util.Log; import com.android.settingslib.applications.ApplicationsState; @@ -33,16 +35,19 @@ public class AppStateLocaleBridge extends AppStateBaseBridge { private static final String TAG = AppStateLocaleBridge.class.getSimpleName(); private final Context mContext; + private final List mListInfos; public AppStateLocaleBridge(Context context, ApplicationsState appState, Callback callback) { super(appState, callback); mContext = context; + mListInfos = context.getPackageManager().queryIntentActivities( + AppLocaleUtil.LAUNCHER_ENTRY_INTENT, PackageManager.GET_META_DATA); } @Override protected void updateExtraInfo(AppEntry app, String packageName, int uid) { - app.extraInfo = AppLocaleUtil.canDisplayLocaleUi(mContext, app) + app.extraInfo = AppLocaleUtil.canDisplayLocaleUi(mContext, app.info.packageName, mListInfos) ? Boolean.TRUE : Boolean.FALSE; } @@ -51,7 +56,8 @@ public class AppStateLocaleBridge extends AppStateBaseBridge { final List allApps = mAppSession.getAllApps(); for (int i = 0; i < allApps.size(); i++) { AppEntry app = allApps.get(i); - app.extraInfo = AppLocaleUtil.canDisplayLocaleUi(mContext, app) + app.extraInfo = + AppLocaleUtil.canDisplayLocaleUi(mContext, app.info.packageName, mListInfos) ? Boolean.TRUE : Boolean.FALSE; } } @@ -66,12 +72,10 @@ public class AppStateLocaleBridge extends AppStateBaseBridge { @Override public boolean filterApp(AppEntry entry) { if (entry.extraInfo == null) { - Log.d(TAG, "No extra info."); + Log.d(TAG, "[" + entry.info.packageName + "]" + " has No extra info."); return false; } return (Boolean) entry.extraInfo; } }; - - } diff --git a/src/com/android/settings/applications/appinfo/AppLocalePreferenceController.java b/src/com/android/settings/applications/appinfo/AppLocalePreferenceController.java index 810d2304cbe..eaa2ec00d76 100644 --- a/src/com/android/settings/applications/appinfo/AppLocalePreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppLocalePreferenceController.java @@ -17,19 +17,29 @@ package com.android.settings.applications.appinfo; import android.content.Context; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.util.FeatureFlagUtils; +import androidx.annotation.VisibleForTesting; + import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.AppLocaleUtil; +import java.util.List; + /** * A controller to update current locale information of application. */ public class AppLocalePreferenceController extends AppInfoPreferenceControllerBase { private static final String TAG = AppLocalePreferenceController.class.getSimpleName(); + private final List mListInfos; + public AppLocalePreferenceController(Context context, String key) { super(context, key); + mListInfos = context.getPackageManager().queryIntentActivities( + AppLocaleUtil.LAUNCHER_ENTRY_INTENT, PackageManager.GET_META_DATA); } @Override @@ -49,7 +59,9 @@ public class AppLocalePreferenceController extends AppInfoPreferenceControllerBa return AppLocaleDetails.getSummary(mContext, mParent.getAppEntry().info.packageName); } + @VisibleForTesting boolean canDisplayLocaleUi() { - return AppLocaleUtil.canDisplayLocaleUi(mContext, mParent.getAppEntry()); + return AppLocaleUtil + .canDisplayLocaleUi(mContext, mParent.getAppEntry().info.packageName, mListInfos); } } diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java index 6e67815d7e7..3c00b73570c 100644 --- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java +++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java @@ -210,7 +210,7 @@ public class AppFilterRegistry { // Apps that can configurate appication's locale. mFilters[FILTER_APPS_LOCALE] = new AppFilterItem( AppStateLocaleBridge.FILTER_APPS_LOCALE, - FILTER_APPS_LOCALE, + FILTER_APPS_LOCALE, R.string.app_locale_picker_title); } diff --git a/tests/unit/src/com/android/settings/applications/AppLocaleUtilTest.java b/tests/unit/src/com/android/settings/applications/AppLocaleUtilTest.java index 22a055f34da..9bc3ef5f1b7 100644 --- a/tests/unit/src/com/android/settings/applications/AppLocaleUtilTest.java +++ b/tests/unit/src/com/android/settings/applications/AppLocaleUtilTest.java @@ -20,27 +20,31 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.app.ActivityManager; import android.content.Context; +import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.content.res.Resources; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.android.settingslib.applications.ApplicationsState.AppEntry; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.ArrayList; +import java.util.List; + @RunWith(AndroidJUnit4.class) public class AppLocaleUtilTest { @Mock @@ -48,15 +52,14 @@ public class AppLocaleUtilTest { @Mock private ActivityManager mActivityManager; @Mock - private AppEntry mEntry; - @Mock private ApplicationInfo mApplicationInfo; @Mock private Resources mResources; private Context mContext; private String mDisallowedPackage = "com.disallowed.package"; - private String mAallowedPackage = "com.allowed.package"; + private String mAllowedPackage = "com.allowed.package"; + private List mListResolveInfo; @Before public void setUp() { @@ -64,54 +67,43 @@ public class AppLocaleUtilTest { mContext = spy(ApplicationProvider.getApplicationContext()); when(mContext.getPackageManager()).thenReturn(mPackageManager); when(mContext.getSystemService(ActivityManager.class)).thenReturn(mActivityManager); - } - - @Test - public void isDisplayLocaleUi_showUI() throws PackageManager.NameNotFoundException { - setTestAppEntry(mAallowedPackage); setDisallowedPackageName(mDisallowedPackage); - setApplicationInfo(/*no platform key*/false); - mEntry.hasLauncherEntry = true; - - assertTrue(AppLocaleUtil.canDisplayLocaleUi(mContext, mEntry)); } @Test - public void isDisplayLocaleUi_notShowUI_hasPlatformKey() + public void canDisplayLocaleUi_showUI() throws PackageManager.NameNotFoundException { + setApplicationInfo(/*no platform key*/ false); + setActivityInfo(mAllowedPackage); + + assertTrue(AppLocaleUtil.canDisplayLocaleUi(mContext, mAllowedPackage, mListResolveInfo)); + } + + @Test + public void canDisplayLocaleUi_notShowUI_hasPlatformKey() throws PackageManager.NameNotFoundException { - setTestAppEntry(mAallowedPackage); - setDisallowedPackageName(mDisallowedPackage); - setApplicationInfo(/*has platform key*/true); - mEntry.hasLauncherEntry = true; + setApplicationInfo(/*has platform key*/ true); + setActivityInfo(mAllowedPackage); - assertFalse(AppLocaleUtil.canDisplayLocaleUi(mContext, mEntry)); + assertFalse(AppLocaleUtil.canDisplayLocaleUi(mContext, mAllowedPackage, mListResolveInfo)); } @Test - public void isDisplayLocaleUi_notShowUI_noLauncherEntry() + public void canDisplayLocaleUi_notShowUI_noLauncherEntry() throws PackageManager.NameNotFoundException { - setTestAppEntry(mAallowedPackage); - setDisallowedPackageName(mDisallowedPackage); setApplicationInfo(/*no platform key*/false); - mEntry.hasLauncherEntry = false; + setActivityInfo(""); - assertFalse(AppLocaleUtil.canDisplayLocaleUi(mContext, mEntry)); + assertFalse(AppLocaleUtil.canDisplayLocaleUi(mContext, mAllowedPackage, mListResolveInfo)); } @Test - public void isDisplayLocaleUi_notShowUI_matchDisallowedPackageList() + public void canDisplayLocaleUi_notShowUI_matchDisallowedPackageList() throws PackageManager.NameNotFoundException { - setTestAppEntry(mDisallowedPackage); - setDisallowedPackageName(mDisallowedPackage); setApplicationInfo(/*no platform key*/false); - mEntry.hasLauncherEntry = false; + setActivityInfo(""); - assertFalse(AppLocaleUtil.canDisplayLocaleUi(mContext, mEntry)); - } - - private void setTestAppEntry(String packageName) { - mEntry.info = mApplicationInfo; - mApplicationInfo.packageName = packageName; + assertFalse(AppLocaleUtil + .canDisplayLocaleUi(mContext, mDisallowedPackage, mListResolveInfo)); } private void setDisallowedPackageName(String packageName) { @@ -132,4 +124,13 @@ public class AppLocaleUtilTest { when(mPackageManager.getPackageInfoAsUser(anyString(), anyInt(), anyInt())).thenReturn( packageInfo); } + + private void setActivityInfo(String packageName) { + ResolveInfo resolveInfo = mock(ResolveInfo.class); + ActivityInfo activityInfo = mock(ActivityInfo.class); + activityInfo.packageName = packageName; + resolveInfo.activityInfo = activityInfo; + mListResolveInfo = new ArrayList<>(); + mListResolveInfo.add(resolveInfo); + } }