Merge "Disable disable button according to user restrictions." into lmp-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
fad2b09db8
@@ -350,12 +350,15 @@ public class InstalledAppDetails extends Fragment
|
||||
boolean enabled = true;
|
||||
if (mUpdatedSysApp) {
|
||||
mUninstallButton.setText(R.string.app_factory_reset);
|
||||
boolean specialDisable = false;
|
||||
boolean showSpecialDisable = false;
|
||||
if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
|
||||
specialDisable = handleDisableable(mSpecialDisableButton);
|
||||
showSpecialDisable = handleDisableable(mSpecialDisableButton);
|
||||
mSpecialDisableButton.setOnClickListener(this);
|
||||
}
|
||||
mMoreControlButtons.setVisibility(specialDisable ? View.VISIBLE : View.GONE);
|
||||
if (mAppControlRestricted) {
|
||||
showSpecialDisable = false;
|
||||
}
|
||||
mMoreControlButtons.setVisibility(showSpecialDisable ? View.VISIBLE : View.GONE);
|
||||
} else {
|
||||
mMoreControlButtons.setVisibility(View.GONE);
|
||||
if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
|
||||
|
Reference in New Issue
Block a user