PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Entries in the Deletion Helper should be default unchecked.

Browse Source 
Bug: 28669483
Change-Id: I88395db46ffb42b757468936bcdf555bb90c0e75
This commit is contained in:
Daniel Nishi
2016-05-11 15:41:44 -07:00
parent 172b04e468
commit 2186893b8f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/deletionhelper/DeletionHelperFragment.java
View File

@@ -61,7 +61,7 @@ public class DeletionHelperFragment extends SettingsPreferenceFragment implement
private ApplicationsState mState; private ApplicationsState mState;
private Session mSession; private Session mSession;
private HashSet<String> mUncheckedApplications; private HashSet<String> mCheckedApplications;
private AppStateUsageStatsBridge mDataUsageBridge; private AppStateUsageStatsBridge mDataUsageBridge;
private ArrayList<AppEntry> mAppEntries; private ArrayList<AppEntry> mAppEntries;
private boolean mHasReceivedAppEntries, mHasReceivedBridgeCallback, mFinishedLoading; private boolean mHasReceivedAppEntries, mHasReceivedBridgeCallback, mFinishedLoading;
@@ -74,7 +74,7 @@ public class DeletionHelperFragment extends SettingsPreferenceFragment implement
Application app = getActivity().getApplication(); Application app = getActivity().getApplication();
mState = ApplicationsState.getInstance(app); mState = ApplicationsState.getInstance(app);
mSession = mState.newSession(this); mSession = mState.newSession(this);
mUncheckedApplications = new HashSet<>(); mCheckedApplications = new HashSet<>();
mDataUsageBridge = new AppStateUsageStatsBridge(getActivity(), mState, this); mDataUsageBridge = new AppStateUsageStatsBridge(getActivity(), mState, this);
addPreferencesFromResource(R.xml.deletion_helper_list); addPreferencesFromResource(R.xml.deletion_helper_list);
@@ -91,7 +91,7 @@ public class DeletionHelperFragment extends SettingsPreferenceFragment implement
savedInstanceState.getBoolean(EXTRA_HAS_SIZES, false); savedInstanceState.getBoolean(EXTRA_HAS_SIZES, false);
mHasReceivedBridgeCallback = mHasReceivedBridgeCallback =
savedInstanceState.getBoolean(EXTRA_HAS_BRIDGE, false); savedInstanceState.getBoolean(EXTRA_HAS_BRIDGE, false);
mUncheckedApplications = mCheckedApplications =
(HashSet<String>) savedInstanceState.getSerializable(EXTRA_CHECKED_SET); (HashSet<String>) savedInstanceState.getSerializable(EXTRA_CHECKED_SET);
} }
} }
@@ -120,7 +120,7 @@ public class DeletionHelperFragment extends SettingsPreferenceFragment implement
ArraySet<String> apps = new ArraySet<>(); ArraySet<String> apps = new ArraySet<>();
for (AppEntry entry : mAppEntries) { for (AppEntry entry : mAppEntries) {
if (!mUncheckedApplications.contains(entry.label)) { if (mCheckedApplications.contains(entry.label)) {
synchronized (entry) { synchronized (entry) {
apps.add(entry.info.packageName); apps.add(entry.info.packageName);
} }
@@ -180,7 +180,7 @@ public class DeletionHelperFragment extends SettingsPreferenceFragment implement
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putBoolean(EXTRA_HAS_SIZES, mHasReceivedAppEntries); outState.putBoolean(EXTRA_HAS_SIZES, mHasReceivedAppEntries);
outState.putBoolean(EXTRA_HAS_BRIDGE, mHasReceivedBridgeCallback); outState.putBoolean(EXTRA_HAS_BRIDGE, mHasReceivedBridgeCallback);
outState.putSerializable(EXTRA_CHECKED_SET, mUncheckedApplications); outState.putSerializable(EXTRA_CHECKED_SET, mCheckedApplications);
} }
@@ -216,7 +216,7 @@ public class DeletionHelperFragment extends SettingsPreferenceFragment implement
preference = new AppDeletionPreference(getActivity(), entry, preference = new AppDeletionPreference(getActivity(), entry,
mState); mState);
preference.setKey(packageName); preference.setKey(packageName);
preference.setChecked(!mUncheckedApplications.contains(packageName)); preference.setChecked(mCheckedApplications.contains(packageName));
preference.setOnPreferenceChangeListener(this); preference.setOnPreferenceChangeListener(this);
mApps.addPreference(preference); mApps.addPreference(preference);
} }
@@ -293,9 +293,9 @@ public class DeletionHelperFragment extends SettingsPreferenceFragment implement
boolean checked = (boolean) newValue; boolean checked = (boolean) newValue;
String packageName = ((AppDeletionPreference) preference).getPackageName(); String packageName = ((AppDeletionPreference) preference).getPackageName();
if (checked) { if (checked) {
mUncheckedApplications.remove(packageName); mCheckedApplications.add(packageName);
} else { } else {
mUncheckedApplications.add(packageName); mCheckedApplications.remove(packageName);
} }
updateFreeButtonText(); updateFreeButtonText();
return true; return true;
@@ -314,7 +314,7 @@ public class DeletionHelperFragment extends SettingsPreferenceFragment implement
final AppEntry entry = mAppEntries.get(i); final AppEntry entry = mAppEntries.get(i);
long entrySize = mAppEntries.get(i).size; long entrySize = mAppEntries.get(i).size;
// If the entrySize is negative, it is either an unknown size or an error occurred. // If the entrySize is negative, it is either an unknown size or an error occurred.
if (!mUncheckedApplications.contains(entry.label) && entrySize > 0) { if (mCheckedApplications.contains(entry.label) && entrySize > 0) {
freeableSpace += entrySize; freeableSpace += entrySize;
} }
} }