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

Merge "Fix Apps storage page to show apps for selected user only" into main

Browse Source
This commit is contained in:
Manish Singh
2024-02-12 10:41:00 +00:00
committed by Android (Google) Code Review
parent 1e6e14c2c5 8498f83141
commit 26c9a6c6f9
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/AppStateClonedAppsBridge.java
View File

@@ -76,7 +76,8 @@ public class AppStateClonedAppsBridge extends AppStateBaseBridge{
protected void updateExtraInfo(AppEntry app, String pkg, int uid) { protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
// Display package if allowlisted but not yet cloned. // Display package if allowlisted but not yet cloned.
// Or if the app is present in clone profile alongwith being in allowlist. // Or if the app is present in clone profile alongwith being in allowlist.
if (mAllowedApps.contains(pkg) && ((!mCloneProfileApps.contains(pkg) || (app.isCloned)))) { if (mAllowedApps.contains(pkg)
&& ((!mCloneProfileApps.contains(pkg) || (app.isClonedProfile())))) {
app.extraInfo = Boolean.TRUE; app.extraInfo = Boolean.TRUE;
} else { } else {
app.extraInfo = Boolean.FALSE; app.extraInfo = Boolean.FALSE;

6
src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
View File

@@ -231,7 +231,7 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
void updateAppCloneWidget(Context context, View.OnClickListener onClickListener, void updateAppCloneWidget(Context context, View.OnClickListener onClickListener,
AppEntry entry) { AppEntry entry) {
if (mAddIcon != null) { if (mAddIcon != null) {
if (!entry.isCloned) { if (!entry.isClonedProfile()) {
mAddIcon.setBackground(context.getDrawable(R.drawable.ic_add_24dp)); mAddIcon.setBackground(context.getDrawable(R.drawable.ic_add_24dp));
} else { } else {
mAddIcon.setBackground(context.getDrawable(R.drawable.ic_trash_can)); mAddIcon.setBackground(context.getDrawable(R.drawable.ic_trash_can));
@@ -254,7 +254,7 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
String packageName = entry.info.packageName; String packageName = entry.info.packageName;
if (mWidgetContainer != null) { if (mWidgetContainer != null) {
if (!entry.isCloned) { if (!entry.isClonedProfile()) {
metricsFeatureProvider.action(context, metricsFeatureProvider.action(context,
SettingsEnums.ACTION_CREATE_CLONE_APP); SettingsEnums.ACTION_CREATE_CLONE_APP);
mAddIcon.setVisibility(View.INVISIBLE); mAddIcon.setVisibility(View.INVISIBLE);
@@ -285,7 +285,7 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
} }
}.execute(); }.execute();
} else if (entry.isCloned) { } else if (entry.isClonedProfile()) {
metricsFeatureProvider.action(context, metricsFeatureProvider.action(context,
SettingsEnums.ACTION_DELETE_CLONE_APP); SettingsEnums.ACTION_DELETE_CLONE_APP);
cloneBackend.uninstallClonedApp(packageName, /*allUsers*/ false, cloneBackend.uninstallClonedApp(packageName, /*allUsers*/ false,

7
src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -295,6 +295,7 @@ public class ManageApplications extends InstrumentedFragment
private String mVolumeUuid; private String mVolumeUuid;
private int mStorageType; private int mStorageType;
private boolean mIsWorkOnly; private boolean mIsWorkOnly;
private boolean mIsPrivateProfileOnly;
private int mWorkUserId; private int mWorkUserId;
private boolean mIsPersonalOnly; private boolean mIsPersonalOnly;
private View mEmptyView; private View mEmptyView;
@@ -378,6 +379,8 @@ public class ManageApplications extends InstrumentedFragment
== ProfileSelectFragment.ProfileType.PERSONAL; == ProfileSelectFragment.ProfileType.PERSONAL;
mIsWorkOnly = args != null && args.getInt(ProfileSelectFragment.EXTRA_PROFILE) mIsWorkOnly = args != null && args.getInt(ProfileSelectFragment.EXTRA_PROFILE)
== ProfileSelectFragment.ProfileType.WORK; == ProfileSelectFragment.ProfileType.WORK;
mIsPrivateProfileOnly = args != null && args.getInt(ProfileSelectFragment.EXTRA_PROFILE)
== ProfileSelectFragment.ProfileType.PRIVATE;
mWorkUserId = args != null ? args.getInt(EXTRA_WORK_ID) : UserHandle.myUserId(); mWorkUserId = args != null ? args.getInt(EXTRA_WORK_ID) : UserHandle.myUserId();
if (mIsWorkOnly && mWorkUserId == UserHandle.myUserId()) { if (mIsWorkOnly && mWorkUserId == UserHandle.myUserId()) {
mWorkUserId = Utils.getManagedProfileId(mUserManager, UserHandle.myUserId()); mWorkUserId = Utils.getManagedProfileId(mUserManager, UserHandle.myUserId());
@@ -660,6 +663,10 @@ public class ManageApplications extends InstrumentedFragment
if (mIsWorkOnly) { if (mIsWorkOnly) {
compositeFilter = new CompoundFilter(compositeFilter, ApplicationsState.FILTER_WORK); compositeFilter = new CompoundFilter(compositeFilter, ApplicationsState.FILTER_WORK);
} }
if (mIsPrivateProfileOnly) {
compositeFilter =
new CompoundFilter(compositeFilter, ApplicationsState.FILTER_PRIVATE_PROFILE);
}
if (mIsPersonalOnly) { if (mIsPersonalOnly) {
compositeFilter = new CompoundFilter(compositeFilter, compositeFilter = new CompoundFilter(compositeFilter,
ApplicationsState.FILTER_PERSONAL); ApplicationsState.FILTER_PERSONAL);