Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add App info > Storage > Manage storage button for apps that support it

Browse Source 
There's a "Clear storage" button in App info > Storage & cache. When app implements a "manage
storage space" activity, that button opens it instead of actually clearing the storage.

"Manage space" activity might not provide an option to clear app storage or it might not work at
all.

This change adds a separate button to launch that activity and makes the "Clear storage" button
ignore its presence.
This commit is contained in:
Dmitry Muhomor
2024-12-05 15:22:43 +02:00
committed by Joey
parent b54aa2f650
commit 6cd3704eb9
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/com/android/settings/applications/AppStorageSettings.java
View File

@@ -206,10 +206,14 @@ public class AppStorageSettings extends AppInfoWithHeader
@VisibleForTesting
void handleClearDataClick() {
handleClearDataClick(false);
}
private void handleClearDataClick(boolean ignoreAppActivity) {
if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
getActivity(), mAppsControlDisallowedAdmin);
} else if (mAppEntry.info.manageSpaceActivityName != null) {
} else if (!ignoreAppActivity && mAppEntry.info.manageSpaceActivityName != null) {
if (!Utils.isMonkeyRunning()) {
Intent intent = new Intent(Intent.ACTION_DEFAULT);
intent.setClassName(mAppEntry.info.packageName,
@@ -295,15 +299,7 @@ public class AppStorageSettings extends AppInfoWithHeader
(mAppEntry.info.flags & (FLAG_SYSTEM | FLAG_ALLOW_CLEAR_USER_DATA)) == FLAG_SYSTEM;
final boolean appRestrictsClearingData = isNonClearableSystemApp || appHasActiveAdmins;
final Intent intent = new Intent(Intent.ACTION_DEFAULT);
if (appHasSpaceManagementUI) {
intent.setClassName(mAppEntry.info.packageName, mAppEntry.info.manageSpaceActivityName);
}
final boolean isManageSpaceActivityAvailable =
getPackageManager().resolveActivity(intent, 0) != null;
if ((!appHasSpaceManagementUI && appRestrictsClearingData)
|| !isManageSpaceActivityAvailable) {
if (appRestrictsClearingData) {
mButtonsPref
.setButton1Text(R.string.clear_user_data_text)
.setButton1Icon(R.drawable.ic_settings_delete)
@@ -312,11 +308,25 @@ public class AppStorageSettings extends AppInfoWithHeader
} else {
mButtonsPref.setButton1Text(R.string.clear_user_data_text);
mButtonsPref.setButton1Icon(R.drawable.ic_settings_delete)
.setButton1OnClickListener(v -> handleClearDataClick());
.setButton1OnClickListener(v -> handleClearDataClick(true));
}
if (appHasSpaceManagementUI) {
final Intent intent = new Intent(Intent.ACTION_DEFAULT);
intent.setClassName(mAppEntry.info.packageName, mAppEntry.info.manageSpaceActivityName);
final boolean isManageSpaceActivityAvailable = getPackageManager().resolveActivity(intent, 0) != null;
if (isManageSpaceActivityAvailable) {
ActionButtonsPreference bp = mButtonsPref;
bp.setButton3Text(R.string.automatic_storage_manager_settings);
bp.setButton3Icon(R.drawable.ic_settings_open);
bp.setButton3OnClickListener(v -> handleClearDataClick(false));
}
}
if (mAppsControlDisallowedBySystem || AppUtils.isMainlineModule(mPm, mPackageName)) {
mButtonsPref.setButton1Enabled(false);
mButtonsPref.setButton3Enabled(false);
}
}
@@ -571,7 +581,7 @@ public class AppStorageSettings extends AppInfoWithHeader
mButtonsPref.setButton1Enabled(false);
} else {
mButtonsPref.setButton1Enabled(true)
.setButton1OnClickListener(v -> handleClearDataClick());
.setButton1OnClickListener(v -> handleClearDataClick(true));
}
if (cacheSize <= 0 || mCacheCleared) {
mButtonsPref.setButton2Enabled(false);