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

Data plan usage summary activity.

Browse Source 
Change-Id: Ibb0889563d432591fd00ac00d03633b1894ad124
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
This commit is contained in:
Rajeev Kumar
2017-07-18 19:21:34 -07:00
parent 3884450e48
commit 4a5e3dc6c5
4 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/com/android/settings/SettingsActivity.java
View File

@@ -33,7 +33,6 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.nfc.NfcAdapter;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.UserHandle;
@@ -50,7 +49,6 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.Toolbar;
import com.android.internal.util.ArrayUtils;
import com.android.settings.Settings.WifiSettingsActivity;
import com.android.settings.backup.BackupSettingsActivity;
@@ -67,7 +65,6 @@ import com.android.settings.wfd.WifiDisplaySettings;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.SettingsDrawerActivity;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -779,10 +776,33 @@ public class SettingsActivity extends SettingsDrawerActivity
pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH), isAdmin)
|| somethingChanged;
somethingChanged = setTileEnabled(new ComponentName(packageName,
Settings.DataUsageSummaryActivity.class.getName()),
Utils.isBandwidthControlEnabled(), isAdmin)
|| somethingChanged;
boolean isDataPlanFeatureEnabled = FeatureFactory.getFactory(this)
.getDataPlanFeatureProvider()
.isEnabled();
// When the data plan feature flag is turned on we disable DataUsageSummaryActivity
// and enable DataPlanUsageSummaryActivity. When the feature flag is turned off we do the
// reverse.
// Disable DataUsageSummaryActivity if the data plan feature flag is turned on otherwise
// disable DataPlanUsageSummaryActivity.
somethingChanged = setTileEnabled(
new ComponentName(packageName,
isDataPlanFeatureEnabled
? Settings.DataUsageSummaryActivity.class.getName()
: Settings.DataPlanUsageSummaryActivity.class.getName()),
false /* enabled */,
isAdmin) || somethingChanged;
// Enable DataUsageSummaryActivity if the data plan feature flag is turned on otherwise
// enable DataPlanUsageSummaryActivity.
somethingChanged = setTileEnabled(
new ComponentName(packageName,
isDataPlanFeatureEnabled
? Settings.DataPlanUsageSummaryActivity.class.getName()
: Settings.DataUsageSummaryActivity.class.getName()),
Utils.isBandwidthControlEnabled() /* enabled */,
isAdmin) || somethingChanged;
somethingChanged = setTileEnabled(new ComponentName(packageName,
Settings.SimSettingsActivity.class.getName()),