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

Commit fc8873a2 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Checkpoint of data usage UI, graphs and lists."

parents 8682f3b7 ab2d8d3a

Android.mk

+2 −0
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_STATIC_JAVA_LIBRARIES := guava



LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := $(call all-java-files-under, src)

AndroidManifest.xml

+14 −0
Original line number Diff line number Diff line
@@ -1128,6 +1128,19 @@ 
                android:resource="@id/security_settings" />

        </activity>



        <activity android:name="Settings$DataUsageSummaryActivity"

                android:label="@string/data_usage_summary_title">

            <intent-filter>

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

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

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

            </intent-filter>

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

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

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

                android:resource="@id/wireless_settings" />

        </activity>



        <receiver android:name=".widget.SettingsAppWidgetProvider"

                android:label="@string/gadget_title"

                android:exported="false"
@@ -1142,5 +1155,6 @@ 
            </intent-filter>

            <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />

        </receiver>



    </application>

</manifest>

res/layout/data_usage_summary.xml

0 → 100644
+33 −0
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.

-->



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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <FrameLayout

        android:id="@+id/chart_container"

        android:layout_width="match_parent"

        android:layout_height="200dip" />



    <ListView

        android:id="@+id/list"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1" />



</LinearLayout>

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -3358,4 +3358,8 @@ found in the list of installed applications.</string> 
    <string name="hdcp_checking_title">HDCP checking</string>

    <!-- HDCP checking dialog title, used for debug purposes only. [CHAR LIMIT=25] -->

    <string name="hdcp_checking_dialog_title">Set HDCP checking behavior</string>



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

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



</resources>

res/xml/wireless_settings.xml

+5 −0
Original line number Diff line number Diff line
@@ -89,4 +89,9 @@ 
        android:summary="@string/proxy_settings_summary" >

    </PreferenceScreen>



    <PreferenceScreen

        android:fragment="com.android.settings.DataUsageSummary"

        android:key="data_usage_summary"

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



</PreferenceScreen>