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

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

Merge "Remove DataSummaryUsageLegacy."

parents 1dd1bdf8 cd21cb8d

AndroidManifest.xml

+2 −23
Original line number Diff line number Diff line
@@ -2365,26 +2365,6 @@ 
            android:enabled="false"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

            <!-- TODO(b/70950124): add shortcut intent-filter -->

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

                <action android:name="android.settings.DATA_USAGE_SETTINGS" />

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

            </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="com.android.settings"

            android:parentActivityName="Settings">

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

                <action android:name="android.settings.DATA_USAGE_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -2400,9 +2380,8 @@ 
            <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.DataUsageSummaryLegacy" />

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

        </activity>



        <activity

            android:name="Settings$MobileDataUsageListActivity"

            android:label="@string/cellular_data_usage"

res/menu/data_usage.xml

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

<!-- Copyright (C) 2011 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.

-->



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

    <item

        android:id="@+id/data_usage_menu_cellular_networks"

        android:title="@string/data_usage_menu_cellular_networks" />

</menu>

res/values/strings.xml

+0 −8
Original line number Diff line number Diff line
@@ -6015,8 +6015,6 @@ 
    <string name="data_usage_menu_auto_sync">Auto-sync data</string>

    <!-- Title for menu option to show details for all SIM cards. [CHAR LIMIT=26] -->

    <string name="data_usage_menu_sim_cards">SIM cards</string>

    <!-- Title for menu option to show details for all cellular networks. [CHAR LIMIT=26] -->

    <string name="data_usage_menu_cellular_networks">Mobile networks</string>

    <!-- Summary String for Cellular data enable toggle. [CHAR LIMIT=33] -->

    <string name="data_usage_cellular_data_summary">Paused at limit</string>








@@ -9169,12 +9167,6 @@







    <!-- Format string for amount of ethernet data used [CHAR LIMIT=30] -->









    <string name="ethernet_data_template"><xliff:g id="amount" example="1 GB">^1</xliff:g> ethernet data</string>

















    <!-- Format for a summary describing the amount of data before the user is warned [CHAR LIMIT=NONE] -->









    <string name="cell_warning_only"><xliff:g name="amount" example="1 GB">%1$s</xliff:g> Data warning</string>

















    <!-- Format for a summary describing the amount of data before the user is warned or limited [CHAR LIMIT=NONE] -->









    <string name="cell_warning_and_limit"><xliff:g name="amount" example="1 GB">%1$s</xliff:g> Data warning / <xliff:g name="amount" example="2 GB">%2$s</xliff:g> Data limit</string>

















    <!-- Title of button and screen for billing cycle preferences [CHAR LIMIT=40] -->









    <string name="billing_cycle">Data warning &amp; limit</string>

































res/xml/data_usage_legacy.xml
deleted100644 → 0



+0
−43






























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_legacy"









            android:title="@string/data_saver_title"









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



















    </PreferenceCategory>



















</PreferenceScreen>
























src/com/android/settings/Settings.java



+0
−1






























Original line number
Diff line number
Diff line







@@ -76,7 +76,6 @@ public class Settings extends SettingsActivity {







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









    public static class DeviceAdminSettingsActivity 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 */ }