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

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

Merge "Data usage app icons and details, chart labels."

parents 48a6de66 d39c6e40

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -1185,7 +1185,8 @@ 
        </activity>



        <activity android:name="Settings$DataUsageSummaryActivity"

                android:label="@string/data_usage_summary_title">

                android:label="@string/data_usage_summary_title"

                android:uiOptions="none">

            <intent-filter>

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

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

res/layout/data_usage_app_title.xml

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

-->



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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:singleLine="true"

    android:ellipsize="marquee"

    android:textAppearance="?android:attr/textAppearanceMedium" />

res/layout/data_usage_chart.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
        settings:primaryDrawable="@drawable/data_grid_primary"

        settings:secondaryDrawable="@drawable/data_grid_secondary"

        settings:borderDrawable="@drawable/data_grid_border"

        settings:labelColor="#24aae1" />

        settings:labelColor="#667bb5" />



    <com.android.settings.widget.ChartNetworkSeriesView

        android:id="@+id/series"

res/layout/data_usage_detail.xml

+12 −9
Original line number Diff line number Diff line
@@ -20,17 +20,20 @@ 
    android:layout_height="match_parent"

    android:orientation="vertical">



    <TextView

        android:id="@+id/app_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginLeft="16dip" />

    <ImageView

        android:id="@+id/app_icon"

        android:layout_width="48dip"

        android:layout_height="48dip"

        android:layout_marginLeft="16dip"

        android:scaleType="centerInside" />



    <TextView

        android:id="@+id/app_subtitle"

    <LinearLayout

        android:id="@+id/app_titles"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginLeft="16dip" />

        android:layout_height="match_parent"

        android:layout_marginLeft="16dip"

        android:layout_marginTop="8dip"

        android:orientation="vertical" />



    <Button

        android:id="@+id/app_settings"

res/layout/data_usage_header.xml

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ 
        android:paddingRight="16dip"

        android:paddingTop="8dip"

        android:paddingBottom="8dip"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearanceSmall" />



    <TextView