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

Commit 682bb3e8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add feature flag for new DataUsageSummary fragment."

parents 547e9403 98998a2f

AndroidManifest.xml

+17 −3
Original line number Diff line number Diff line
@@ -2402,6 +2402,20 @@ 
        </activity>



        <activity android:name="Settings$DataUsageSummaryActivity"

                android:label="@string/data_usage_summary_title"

                android:icon="@drawable/ic_settings_data_usage"

                android:enabled="false">

            <!-- TODO(b/70950124): add 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.DataUsageSummary" />

        </activity>



        <activity android:name="Settings$DataUsageSummaryLegacyActivity"

                  android:label="@string/data_usage_summary_title"

                  android:icon="@drawable/ic_settings_data_usage"

                  android:taskAffinity="">
@@ -2416,7 +2430,7 @@ 
            <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.DataUsageSummary" />

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

        </activity>



        <activity android:name="Settings$MobileDataUsageListActivity"

res/xml/data_usage_legacy.xml

0 → 100644
+43 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="data_usage_screen"

    android:title="@string/data_usage_summary_title">



    <PreferenceCategory

        android:key="data_usage_category"

        android:title="@string/usage">



        <com.android.settings.SummaryPreference

            android:key="status_header"

            android:selectable="false" />



        <Preference

            android:key="limit_summary"

            android:selectable="false"

            settings:allowDividerBelow="true" />



        <com.android.settings.datausage.DataSaverPreference

            android:key="restrict_background"

            android:title="@string/data_saver_title"

            android:fragment="com.android.settings.datausage.DataSaverSummary" />



    </PreferenceCategory>



</PreferenceScreen>

src/com/android/settings/Settings.java

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

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

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

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

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

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

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

src/com/android/settings/SettingsActivity.java

+15 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.support.v7.preference.Preference; 
import android.support.v7.preference.PreferenceManager;

import android.text.TextUtils;

import android.transition.TransitionManager;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.view.View;

import android.view.View.OnClickListener;
@@ -57,6 +58,7 @@ import com.android.internal.util.ArrayUtils; 
import com.android.settings.Settings.WifiSettingsActivity;

import com.android.settings.applications.manageapplications.ManageApplications;

import com.android.settings.backup.BackupSettingsActivity;

import com.android.settings.core.FeatureFlags;

import com.android.settings.core.gateway.SettingsGateway;

import com.android.settings.dashboard.DashboardFeatureProvider;

import com.android.settings.dashboard.DashboardSummary;
@@ -791,6 +793,19 @@ public class SettingsActivity extends SettingsDrawerActivity 
                        Settings.PowerUsageSummaryLegacyActivity.class.getName()),

                mBatteryPresent && !isBatterySettingsV2Enabled, isAdmin) || somethingChanged;



        final boolean isDataUsageSettingsV2Enabled =

                FeatureFlagUtils.isEnabled(this, FeatureFlags.DATA_USAGE_SETTINGS_V2);

        // Enable new data usage page if v2 enabled

        somethingChanged = setTileEnabled(new ComponentName(packageName,

                        Settings.DataUsageSummaryActivity.class.getName()),

                Utils.isBandwidthControlEnabled() && isDataUsageSettingsV2Enabled, isAdmin)

                || somethingChanged;

        // Enable legacy data usage page if v2 disabled

        somethingChanged = setTileEnabled(new ComponentName(packageName,

                        Settings.DataUsageSummaryLegacyActivity.class.getName()),

                Utils.isBandwidthControlEnabled() && !isDataUsageSettingsV2Enabled, isAdmin)

                || somethingChanged;



        somethingChanged = setTileEnabled(new ComponentName(packageName,

                        Settings.UserSettingsActivity.class.getName()),

                UserHandle.MU_ENABLED && UserManager.supportsMultipleUsers()

src/com/android/settings/core/FeatureFlags.java

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ public class FeatureFlags { 
    public static final String ZONE_PICKER_V2 = "settings_zone_picker_v2";

    public static final String ABOUT_PHONE_V2 = "settings_about_phone_v2";

    public static final String BLUETOOTH_WHILE_DRIVING = "settings_bluetooth_while_driving";

    public static final String DATA_USAGE_SETTINGS_V2 = "settings_data_usage_v2";

}