Merge "Allow users to re-enable apps once disabling them"

This commit is contained in:
Jason Monk
2015-04-23 17:55:33 +00:00
committed by Android (Google) Code Review

View File

@@ -550,11 +550,9 @@ public class ManageApplications extends InstrumentedFragment
ApplicationsState.AppEntry entry = mApplications.getAppEntry(position);
mCurrentPkgName = entry.info.packageName;
mCurrentUid = entry.info.uid;
if (isAppEntryViewEnabled(entry)) {
startApplicationDetailsActivity();
}
}
}
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@@ -658,13 +656,6 @@ public class ManageApplications extends InstrumentedFragment
}
private static boolean isAppEntryViewEnabled(AppEntry entry) {
if ((entry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0 || !entry.info.enabled) {
return false;
}
return true;
}
/*
* Custom adapter implementation for the ListView
* This adapter maintains a map for each displayed application and its properties
@@ -991,7 +982,6 @@ public class ManageApplications extends InstrumentedFragment
holder.appIcon.setImageDrawable(entry.icon);
}
updateSummary(holder);
convertView.setEnabled(isAppEntryViewEnabled(entry));
if ((entry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0) {
holder.disabled.setVisibility(View.VISIBLE);
holder.disabled.setText(R.string.not_installed);