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

Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa am: c75c3ce3b3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: Id210b618f8febff7f3be3dc85681adfde580087a
This commit is contained in:
Yanting Yang
2020-06-15 03:30:59 +00:00
committed by Automerger Merge Worker
parent 09aa46b15d c75c3ce3b3
commit be4dbdbea4
6 changed files with 107 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,7 @@ import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.deviceinfo.StorageWizardMoveConfirm;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState.Callbacks;
import com.android.settingslib.applications.StorageStatsSource;
import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
@@ -317,7 +318,7 @@ public class AppStorageSettings extends AppInfoWithHeader
.setButton1OnClickListener(v -> handleClearDataClick());
}
if (mAppsControlDisallowedBySystem) {
if (mAppsControlDisallowedBySystem || AppUtils.isMainlineModule(mPm, mPackageName)) {
mButtonsPref.setButton1Enabled(false);
}
}
@@ -575,7 +576,7 @@ public class AppStorageSettings extends AppInfoWithHeader
.setButton2OnClickListener(v -> handleClearCacheClick());
}
}
if (mAppsControlDisallowedBySystem) {
if (mAppsControlDisallowedBySystem || AppUtils.isMainlineModule(mPm, mPackageName)) {
mButtonsPref.setButton1Enabled(false).setButton2Enabled(false);
}
}