diff options
| author | Julia Reynolds <juliacr@google.com> | 2014-08-08 12:22:42 -0400 |
|---|---|---|
| committer | Julia Reynolds <juliacr@google.com> | 2014-08-14 17:34:41 +0000 |
| commit | d093c9f059a9fa9f68504da176a4913a9793d80e (patch) | |
| tree | 9190554659f4569ad9b5472f958052e53eca5050 /src/com/android | |
| parent | 841f760fd7345ef2d84b9409c27e36c2365a3de4 (diff) | |
| download | packages_apps_Settings-d093c9f059a9fa9f68504da176a4913a9793d80e.tar.gz packages_apps_Settings-d093c9f059a9fa9f68504da176a4913a9793d80e.tar.bz2 packages_apps_Settings-d093c9f059a9fa9f68504da176a4913a9793d80e.zip | |
Disable disable button according to user restrictions.
Bug: 16891777
Change-Id: I5223af905dc43d259c5fd3e03eedf8c71bf23ae9
Diffstat (limited to 'src/com/android')
| -rwxr-xr-x | src/com/android/settings/applications/InstalledAppDetails.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index 463520d03..28bc7eb00 100755 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -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) { |