Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5984c71a authored by Rajeev Kumar's avatar Rajeev Kumar Committed by Android (Google) Code Review
Browse files

Merge "Data plan usage summary activity."

parents 1dcfbdb0 4a5e3dc6

AndroidManifest.xml

+18 −0
Original line number Diff line number Diff line
@@ -2413,6 +2413,24 @@ 
                android:value="com.android.settings.CryptKeeperSettings" />

        </activity>



        <activity android:name="Settings$DataPlanUsageSummaryActivity"

                android:label="@string/data_usage_summary_title"

                android:icon="@drawable/ic_settings_data_usage"

                android:taskAffinity="">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter android:priority="10">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                    android:value="com.android.settings.category.ia.wireless" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                    android:value="com.android.settings.datausage.DataPlanUsageSummary" />

        </activity>



        <activity android:name="Settings$DataUsageSummaryActivity"

                android:label="@string/data_usage_summary_title"

                android:icon="@drawable/ic_settings_data_usage"

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ public class Settings extends SettingsActivity { 
    public static class AccountSyncSettingsInAddAccountActivity extends SettingsActivity { /* empty */ }

    public static class CryptKeeperSettingsActivity extends SettingsActivity { /* empty */ }

    public static class DeviceAdminSettingsActivity extends SettingsActivity { /* empty */ }

    public static class DataPlanUsageSummaryActivity extends SettingsActivity { /* empty */ }

    public static class DataUsageSummaryActivity extends SettingsActivity { /* empty */ }

    public static class MobileDataUsageListActivity extends SettingsActivity { /* empty */ }

    public static class ConfigureWifiSettingsActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/SettingsActivity.java

+27 −7
Original line number Diff line number Diff line
@@ -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()),

src/com/android/settings/core/gateway/SettingsGateway.java

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment; 
import com.android.settings.bluetooth.BluetoothSettings;

import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;

import com.android.settings.dashboard.SupportFragment;

import com.android.settings.datausage.DataPlanUsageSummary;

import com.android.settings.datausage.DataUsageList;

import com.android.settings.datausage.DataUsageSummary;

import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
@@ -186,6 +187,7 @@ public class SettingsGateway { 
            PickupGestureSettings.class.getName(),

            DoubleTwistGestureSettings.class.getName(),

            CryptKeeperSettings.class.getName(),

            DataPlanUsageSummary.class.getName(),

            DataUsageSummary.class.getName(),

            DreamSettings.class.getName(),

            UserSettings.class.getName(),
@@ -269,6 +271,7 @@ public class SettingsGateway { 
            SupportDashboardActivity.class.getName(),

            // Home page > Network & Internet

            Settings.WifiSettingsActivity.class.getName(),

            Settings.DataPlanUsageSummaryActivity.class.getName(),

            Settings.DataUsageSummaryActivity.class.getName(),

            Settings.SimSettingsActivity.class.getName(),

            // Home page > Connected devices