[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 cae20ce2f7
)
Merged-In: Ibfb91f0bb8d8ff54cadd041250b3cff252dbe591
This commit is contained in:
@@ -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<ResolveInfo> 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<ResolveInfo> infos) {
|
||||
return infos.stream()
|
||||
.anyMatch(info -> info.activityInfo.packageName.equals(packageName));
|
||||
}
|
||||
}
|
||||
|
@@ -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<ResolveInfo> 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<AppEntry> 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;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
@@ -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<ResolveInfo> 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);
|
||||
}
|
||||
}
|
||||
|
@@ -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);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user