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

Merge "[Panlingual] Fix icon shall have work badage in work profile." into tm-dev

Browse Source
This commit is contained in:
Tom Hsu
2022-05-23 16:17:54 +00:00
committed by Android (Google) Code Review
parent 39eb991aa7 7e27ecb91e
commit 883f5e2572
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/applications/appinfo/AppLocaleDetails.java
View File

@@ -66,11 +66,13 @@ public class AppLocaleDetails extends SettingsPreferenceFragment {
/** /**
* Create a instance of AppLocaleDetails. * Create a instance of AppLocaleDetails.
* @param packageName Indicates which application need to show the locale picker. * @param packageName Indicates which application need to show the locale picker.
* @param uid User id.
*/ */
public static AppLocaleDetails newInstance(String packageName) { public static AppLocaleDetails newInstance(String packageName, int uid) {
AppLocaleDetails appLocaleDetails = new AppLocaleDetails(); AppLocaleDetails appLocaleDetails = new AppLocaleDetails();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString(AppInfoBase.ARG_PACKAGE_NAME, packageName); bundle.putString(AppInfoBase.ARG_PACKAGE_NAME, packageName);
bundle.putInt(AppInfoBase.ARG_PACKAGE_UID, uid);
appLocaleDetails.setArguments(bundle); appLocaleDetails.setArguments(bundle);
return appLocaleDetails; return appLocaleDetails;
} }
@@ -81,13 +83,15 @@ public class AppLocaleDetails extends SettingsPreferenceFragment {
Bundle bundle = getArguments(); Bundle bundle = getArguments();
mPackageName = bundle.getString(AppInfoBase.ARG_PACKAGE_NAME, ""); mPackageName = bundle.getString(AppInfoBase.ARG_PACKAGE_NAME, "");
if (mPackageName.isEmpty()) { if (mPackageName.isEmpty()) {
Log.d(TAG, "No package name."); Log.d(TAG, "There is no package name.");
finish(); finish();
} }
int uid = bundle.getInt(AppInfoBase.ARG_PACKAGE_UID, getContext().getUserId());
addPreferencesFromResource(R.xml.app_locale_details); addPreferencesFromResource(R.xml.app_locale_details);
mPrefOfDescription = getPreferenceScreen().findPreference(KEY_APP_DESCRIPTION); mPrefOfDescription = getPreferenceScreen().findPreference(KEY_APP_DESCRIPTION);
mPrefOfDisclaimer = getPreferenceScreen().findPreference(KEY_APP_DISCLAIMER); mPrefOfDisclaimer = getPreferenceScreen().findPreference(KEY_APP_DISCLAIMER);
mApplicationInfo = getApplicationInfo(mPackageName, getContext().getUserId()); mApplicationInfo = getApplicationInfo(mPackageName, uid);
setDisclaimerPreference(); setDisclaimerPreference();
} }

15
src/com/android/settings/localepicker/AppLocalePickerActivity.java
View File

@@ -62,13 +62,14 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
finish(); finish();
return; return;
} }
int uid = getIntent().getIntExtra(AppInfoBase.ARG_PACKAGE_UID, -1); mContextAsUser = this;
if (uid == -1) { if (getIntent().hasExtra(AppInfoBase.ARG_PACKAGE_UID)) {
Log.w(TAG, "Unexpected user id"); int userId = getIntent().getIntExtra(AppInfoBase.ARG_PACKAGE_UID, -1);
finish(); if (userId != -1) {
} UserHandle userHandle = UserHandle.getUserHandleForUid(userId);
UserHandle userHandle = UserHandle.getUserHandleForUid(uid);
mContextAsUser = createContextAsUser(userHandle, 0); mContextAsUser = createContextAsUser(userHandle, 0);
}
}
setTitle(R.string.app_locale_picker_title); setTitle(R.string.app_locale_picker_title);
getActionBar().setDisplayHomeAsUpEnabled(true); getActionBar().setDisplayHomeAsUpEnabled(true);
@@ -79,7 +80,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
false /* translate only */, false /* translate only */,
mPackageName, mPackageName,
this); this);
mAppLocaleDetails = AppLocaleDetails.newInstance(mPackageName); mAppLocaleDetails = AppLocaleDetails.newInstance(mPackageName, mContextAsUser.getUserId());
mAppLocaleDetailContainer = launchAppLocaleDetailsPage(); mAppLocaleDetailContainer = launchAppLocaleDetailsPage();
// Launch Locale picker part. // Launch Locale picker part.
launchLocalePickerPage(); launchLocalePickerPage();