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

Data saver fixes

Browse Source 
- Correct summary for number of apps with unrestricted
 - Show system option on unrestricted access page
 - general betterness

Bug: 26796370
Bug: 27378294
Bug: 27122309
Change-Id: Ia57b56a25175182cb1a5a1231c20dc3c71cc3427
This commit is contained in:
Jason Monk
2016-03-01 10:44:16 -05:00
parent 8eb11e473d
commit a8b0366a02
2 changed files with 172 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/com/android/settings/datausage/DataSaverSummary.java
View File

@@ -14,24 +14,36 @@
package com.android.settings.datausage;
import android.app.Application;
import android.os.Bundle;
import android.support.v7.preference.Preference;
import android.util.Log;
import android.widget.Switch;
import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.AppStateBaseBridge.Callback;
import com.android.settings.datausage.DataSaverBackend.Listener;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.SwitchBar.OnSwitchChangeListener;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.Callbacks;
import com.android.settingslib.applications.ApplicationsState.Session;
import java.util.ArrayList;
public class DataSaverSummary extends SettingsPreferenceFragment
implements SwitchBar.OnSwitchChangeListener, DataSaverBackend.Listener {
implements OnSwitchChangeListener, Listener, Callback, Callbacks {
private static final String KEY_UNRESTRICTED_ACCESS = "unrestricted_access";
private SwitchBar mSwitchBar;
private DataSaverBackend mDataSaverBackend;
private Preference mUnrestrictedAccess;
private ApplicationsState mApplicationsState;
private AppStateDataUsageBridge mDataUsageBridge;
private Session mSession;
@Override
public void onCreate(Bundle icicle) {
@@ -39,7 +51,11 @@ public class DataSaverSummary extends SettingsPreferenceFragment
addPreferencesFromResource(R.xml.data_saver);
mUnrestrictedAccess = findPreference(KEY_UNRESTRICTED_ACCESS);
mApplicationsState = ApplicationsState.getInstance(
(Application) getContext().getApplicationContext());
mDataSaverBackend = new DataSaverBackend(getContext());
mDataUsageBridge = new AppStateDataUsageBridge(mApplicationsState, this, mDataSaverBackend);
mSession = mApplicationsState.newSession(this);
}
@Override
@@ -53,17 +69,16 @@ public class DataSaverSummary extends SettingsPreferenceFragment
@Override
public void onResume() {
super.onResume();
mDataSaverBackend.addListener(this);
mDataSaverBackend.refreshWhitelist();
int count = mDataSaverBackend.getWhitelistedCount();
mUnrestrictedAccess.setSummary(getResources().getQuantityString(
R.plurals.data_saver_unrestricted_summary, count, count));
mSession.resume();
mDataUsageBridge.resume();
}
@Override
public void onPause() {
super.onPause();
mDataSaverBackend.remListener(this);
mDataUsageBridge.pause();
mSession.pause();
}
@Override
@@ -80,4 +95,63 @@ public class DataSaverSummary extends SettingsPreferenceFragment
public void onDataSaverChanged(boolean isDataSaving) {
mSwitchBar.setChecked(isDataSaving);
}
@Override
public void onExtraInfoUpdated() {
int count = 0;
final ArrayList<AppEntry> allApps = mSession.getAllApps();
final int N = allApps.size();
for (int i = 0; i < N; i++) {
final AppEntry entry = allApps.get(i);
if (!ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER.filterApp(entry)) {
continue;
}
if (entry.extraInfo != null && ((AppStateDataUsageBridge.DataUsageState)
entry.extraInfo).isDataSaverWhitelisted) {
count++;
}
}
mUnrestrictedAccess.setSummary(getResources().getQuantityString(
R.plurals.data_saver_unrestricted_summary, count, count));
}
@Override
public void onRunningStateChanged(boolean running) {
}
@Override
public void onPackageListChanged() {
}
@Override
public void onRebuildComplete(ArrayList<AppEntry> apps) {
}
@Override
public void onPackageIconChanged() {
}
@Override
public void onPackageSizeChanged(String packageName) {
}
@Override
public void onAllSizesComputed() {
}
@Override
public void onLauncherInfoChanged() {
}
@Override
public void onLoadEntriesCompleted() {
}
}