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

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

Merge "Foreground/background network stats pie chart."

parents 825df4fd 54d0af57

res/layout/data_usage_chart.xml

+8 −3
Original line number Diff line number Diff line
@@ -19,8 +19,13 @@ 
    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

    android:id="@+id/chart"

    android:layout_width="match_parent"

    android:layout_height="220dip"

    android:padding="16dip">

    android:layout_height="@dimen/data_usage_chart_height"

    android:paddingLeft="@*android:dimen/preference_item_padding_side"

    android:paddingRight="@*android:dimen/preference_item_padding_side"

    android:paddingTop="16dip"

    android:paddingBottom="16dip"

    settings:optimalWidth="@dimen/data_usage_chart_optimalWidth"

    settings:optimalWidthWeight="0.4">



    <com.android.settings.widget.ChartGridView

        android:id="@+id/grid"
@@ -48,7 +53,7 @@ 
        android:layout_gravity="left|bottom"

        settings:strokeColor="#d88d3a"

        settings:fillColor="#c0ba7f3e"

        settings:fillColorSecondary="#0000" />

        settings:fillColorSecondary="#60ba7f3e" />



    <com.android.settings.widget.ChartSweepView

        android:id="@+id/sweep_warning"

res/layout/data_usage_cycles.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:paddingLeft="16dip"

    android:paddingRight="16dip">

    android:paddingLeft="@*android:dimen/preference_item_padding_side"

    android:paddingRight="@*android:dimen/preference_item_padding_side">



    <TextView

        android:layout_width="wrap_content"

res/layout/data_usage_detail.xml

+60 −14
Original line number Diff line number Diff line
@@ -17,29 +17,75 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/app_detail"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginLeft="@*android:dimen/preference_item_padding_side"

        android:layout_marginRight="@*android:dimen/preference_item_padding_side"

        android:orientation="horizontal">



        <LinearLayout

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginRight="@*android:dimen/preference_item_padding_inner"

            android:orientation="vertical">



            <ImageView

                android:id="@+id/app_icon"

                android:layout_width="48dip"

                android:layout_height="48dip"

        android:layout_marginLeft="16dip"

                android:scaleType="centerInside" />



            <LinearLayout

                android:id="@+id/app_titles"

                android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginLeft="16dip"

                android:layout_height="wrap_content"

                android:layout_marginTop="8dip"

                android:orientation="vertical" />



            <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="8dip"

                android:textColor="#d88d3a"

                android:text="@string/data_usage_label_foreground" />

            <TextView

                android:id="@+id/app_foreground"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textColor="#d88d3a" />



            <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="8dip"

                android:text="@string/data_usage_label_background" />

            <TextView

                android:id="@+id/app_background"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />



        </LinearLayout>



        <com.android.settings.widget.PieChartView

            android:id="@+id/app_pie_chart"

            android:layout_width="160dip"

            android:layout_height="160dip" />



    </LinearLayout>



    <Button

        android:id="@+id/app_settings"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_margin="16dip"

        android:layout_marginLeft="@*android:dimen/preference_item_padding_side"

        android:layout_marginRight="@*android:dimen/preference_item_padding_side"

        android:layout_marginTop="16dip"

        android:layout_marginBottom="16dip"

        android:text="@string/data_usage_app_settings" />



    <LinearLayout

res/layout/data_usage_header.xml

+4 −4
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 
        android:id="@+id/usage_summary"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingLeft="16dip"

        android:paddingRight="16dip"

        android:paddingLeft="@*android:dimen/preference_item_padding_side"

        android:paddingRight="@*android:dimen/preference_item_padding_side"

        android:paddingTop="8dip"

        android:paddingBottom="8dip"

        android:singleLine="true"
@@ -52,8 +52,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:visibility="gone"

        android:paddingLeft="16dip"

        android:paddingRight="16dip"

        android:paddingLeft="@*android:dimen/preference_item_padding_side"

        android:paddingRight="@*android:dimen/preference_item_padding_side"

        android:paddingTop="8dip"

        android:paddingBottom="8dip"

        android:text="@string/data_usage_empty"

res/layout/data_usage_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingLeft="16dip"

    android:paddingRight="16dip"

    android:paddingLeft="@*android:dimen/preference_item_padding_side"

    android:paddingRight="@*android:dimen/preference_item_padding_side"

    android:paddingTop="8dip"

    android:paddingBottom="8dip"

    android:columnCount="3">