Data usage app icons and details, chart labels.

Add app icons into both summary list and details pane. Also show list
of all applications merged under a UID. Draw dates on chart axis, and
avoid flashing policy sweeps when switching networks in detail mode.

Bug: 5087283, 5038812
Change-Id: I1dcd03ca85b517f8726452af8a46b4be9b3d20f1
This commit is contained in:
Jeff Sharkey
2011-08-04 21:17:23 -07:00
parent ce919e40c9
commit d39c6e4083
11 changed files with 183 additions and 57 deletions

View File

@@ -0,0 +1,22 @@
<?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" />

View File

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

View File

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

View File

@@ -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

View File

@@ -21,7 +21,15 @@
android:paddingRight="16dip"
android:paddingTop="8dip"
android:paddingBottom="8dip"
android:columnCount="2">
android:columnCount="3">
<ImageView
android:id="@android:id/icon"
android:layout_width="48dip"
android:layout_height="48dip"
android:layout_rowSpan="2"
android:layout_marginRight="8dip"
android:scaleType="centerInside" />
<TextView
android:id="@android:id/title"