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

Merge "Some cleanups in DataUsageSummary class: 1. Get rid of unused constants. 2. Fix typo in instance variable name. 3. Convert an instance variable to a local variable. 4. Use Java8 lambda for SummaryProviderFactory instance."

Browse Source
This commit is contained in:
Rajeev Kumar
2017-07-06 01:20:45 +00:00
committed by Android (Google) Code Review
parent 77ba611ac0 8f425680ae
commit e72113a5a8
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -55,7 +55,6 @@ import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable; import com.android.settings.search.Indexable;
import com.android.settingslib.NetworkPolicyEditor; import com.android.settingslib.NetworkPolicyEditor;
import com.android.settingslib.net.DataUsageController; import com.android.settingslib.net.DataUsageController;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -65,7 +64,6 @@ import static android.net.NetworkPolicy.LIMIT_DISABLED;
public class DataUsageSummary extends DataUsageBase implements Indexable, DataUsageEditController { public class DataUsageSummary extends DataUsageBase implements Indexable, DataUsageEditController {
private static final String TAG = "DataUsageSummary";
static final boolean LOGD = false; static final boolean LOGD = false;
public static final boolean TEST_RADIOS = false; public static final boolean TEST_RADIOS = false;
@@ -85,9 +83,8 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
private Preference mLimitPreference; private Preference mLimitPreference;
private NetworkTemplate mDefaultTemplate; private NetworkTemplate mDefaultTemplate;
private int mDataUsageTemplate; private int mDataUsageTemplate;
private NetworkRestrictionsPreference mNetworkRestrcitionPreference; private NetworkRestrictionsPreference mNetworkRestrictionPreference;
private WifiManager mWifiManager; private WifiManager mWifiManager;
private NetworkPolicyManager mPolicyManager;
private NetworkPolicyEditor mPolicyEditor; private NetworkPolicyEditor mPolicyEditor;
@Override @Override
@@ -100,9 +97,9 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
super.onCreate(icicle); super.onCreate(icicle);
final Context context = getContext(); final Context context = getContext();
mPolicyManager = NetworkPolicyManager.from(context); NetworkPolicyManager policyManager = NetworkPolicyManager.from(context);
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
mPolicyEditor = new NetworkPolicyEditor(mPolicyManager); mPolicyEditor = new NetworkPolicyEditor(policyManager);
boolean hasMobileData = hasMobileData(context); boolean hasMobileData = hasMobileData(context);
mDataUsageController = new DataUsageController(context); mDataUsageController = new DataUsageController(context);
@@ -203,7 +200,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
TemplatePreferenceCategory category = (TemplatePreferenceCategory) TemplatePreferenceCategory category = (TemplatePreferenceCategory)
inflatePreferences(R.xml.data_usage_wifi); inflatePreferences(R.xml.data_usage_wifi);
category.setTemplate(NetworkTemplate.buildTemplateWifiWildcard(), 0, services); category.setTemplate(NetworkTemplate.buildTemplateWifiWildcard(), 0, services);
mNetworkRestrcitionPreference = mNetworkRestrictionPreference =
(NetworkRestrictionsPreference) category.findPreference(KEY_NETWORK_RESTRICTIONS); (NetworkRestrictionsPreference) category.findPreference(KEY_NETWORK_RESTRICTIONS);
} }
@@ -293,7 +290,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
mLimitPreference.setSummary(null); mLimitPreference.setSummary(null);
} }
updateNetworkRestrictionSummary(mNetworkRestrcitionPreference); updateNetworkRestrictionSummary(mNetworkRestrictionPreference);
PreferenceScreen screen = getPreferenceScreen(); PreferenceScreen screen = getPreferenceScreen();
for (int i = 1; i < screen.getPreferenceCount(); i++) { for (int i = 1; i < screen.getPreferenceCount(); i++) {
@@ -463,13 +460,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
} }
public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
= new SummaryLoader.SummaryProviderFactory() { = SummaryProvider::new;
@Override
public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
SummaryLoader summaryLoader) {
return new SummaryProvider(activity, summaryLoader);
}
};
/** /**
* For search * For search