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

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

Merge "Remove dead code for DataPlanUsageSummary"

parents a0ee8ad0 3ed55b14

AndroidManifest.xml

+0 −18
Original line number Diff line number Diff line
@@ -2383,24 +2383,6 @@ 
                android:value="com.android.settings.security.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"

res/layout/data_plans_sync_time_preference.xml

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

<!--

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

-->



<!-- Shows the data plans sync time -->

<TextView

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

        android:id="@android:id/title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="@dimen/preference_no_icon_padding_start"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:gravity="end"

        android:textColor="?android:attr/textColorSecondary"/>

res/layout/manage_data_plans_preference.xml

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

<!--

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

-->



<FrameLayout

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="@dimen/preference_no_icon_padding_start"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:paddingTop="8dp"

        android:paddingBottom="16dp">

    <Button

            android:id="@+id/manage_data_plans"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/data_plan_usage_manage_plans_button_text"

            android:textAllCaps="true"

            style="@style/ActionPrimaryButton" />

</FrameLayout>

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -5745,9 +5745,6 @@ 
    <!--  action to select all [CHAR LIMIT=30] -->

    <string name="select_all">Select all</string>









    <!-- A button that gets displayed in data plan usage preference in settings page to manage data plans [CHAR LIMIT=25] -->









    <string name="data_plan_usage_manage_plans_button_text">Manage plans</string>

















    <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->









    <string name="data_usage_summary_title">Data usage</string>









    <!-- Activity title for Appk data usage summary. [CHAR LIMIT=25] -->
































res/xml/data_plan_usage.xml
deleted100644 → 0



+0
−25






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!-- Copyright (C) 2017 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"









        android:title="@string/data_usage_summary_title">



















    <PreferenceCategory









            android:key="data_plan_usage"









            android:title="@string/usage">



















    </PreferenceCategory>









</PreferenceScreen>