Merge "Change icons for disable and enable button"

This commit is contained in:
TreeHugger Robot
2019-03-27 08:06:33 +00:00
committed by Android (Google) Code Review
3 changed files with 53 additions and 3 deletions

View File

@@ -560,15 +560,15 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
|| isSystemPackage(mActivity.getResources(), mPm, mPackageInfo)) {
// Disable button for core system applications.
mButtonsPref.setButton2Text(R.string.disable_text)
.setButton2Icon(R.drawable.ic_settings_delete);
.setButton2Icon(R.drawable.ic_settings_disable);
} else if (mAppEntry.info.enabled && !isDisabledUntilUsed()) {
mButtonsPref.setButton2Text(R.string.disable_text)
.setButton2Icon(R.drawable.ic_settings_delete);
.setButton2Icon(R.drawable.ic_settings_disable);
disableable = !mApplicationFeatureProvider.getKeepEnabledPackages()
.contains(mAppEntry.info.packageName);
} else {
mButtonsPref.setButton2Text(R.string.enable_text)
.setButton2Icon(R.drawable.ic_settings_install);
.setButton2Icon(R.drawable.ic_settings_enable);
disableable = true;
}