am eb0d3b7c: am fad2b09d: Merge "Disable disable button according to user restrictions." into lmp-dev

* commit 'eb0d3b7cd02ac8d89b52d26f495ade11bc85c364':
  Disable disable button according to user restrictions.
This commit is contained in:
Julia Reynolds
2014-08-15 21:16:59 +00:00
committed by Android Git Automerger

View File

@@ -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) {