Merge "Data usage fit and finish." (18d2b15b) · Commits · e / os / android_packages_apps_Settings

res/layout/data_usage_chart.xml

+14 −14

Original line number	Diff line number	Diff line
		@@ -50,20 +50,6 @@
		settings:fillColor="#c0ba7f3e"
		settings:fillColorSecondary="#0000" />

		<com.android.settings.widget.ChartSweepView
		android:id="@+id/sweep_left"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		settings:sweepDrawable="@drawable/data_sweep_left"
		settings:followAxis="horizontal" />

		<com.android.settings.widget.ChartSweepView
		android:id="@+id/sweep_right"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		settings:sweepDrawable="@drawable/data_sweep_right"
		settings:followAxis="horizontal" />

		<com.android.settings.widget.ChartSweepView
		android:id="@+id/sweep_warning"
		android:layout_width="match_parent"
		@@ -84,4 +70,18 @@
		settings:labelTemplate="@string/data_usage_sweep_limit"
		settings:labelColor="#c01a2c" />

		<com.android.settings.widget.ChartSweepView
		android:id="@+id/sweep_left"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		settings:sweepDrawable="@drawable/data_sweep_left"
		settings:followAxis="horizontal" />

		<com.android.settings.widget.ChartSweepView
		android:id="@+id/sweep_right"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		settings:sweepDrawable="@drawable/data_sweep_right"
		settings:followAxis="horizontal" />

		</com.android.settings.widget.DataUsageChartView>

0 → 100644

+37 −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:id="@+id/cycles"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:paddingLeft="16dip"
		android:paddingRight="16dip">

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:text="@string/data_usage_cycle" />

		<Spinner
		android:id="@+id/cycles_spinner"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="1" />

		</LinearLayout>

+9 −18

Original line number	Diff line number	Diff line
		@@ -32,28 +32,19 @@
		android:divider="?android:attr/listDivider" />
		</FrameLayout>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:paddingLeft="16dip"
		android:paddingRight="16dip">
		<include layout="@layout/data_usage_cycles" />
		<include layout="@layout/data_usage_chart" />

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:text="@string/data_usage_cycle" />

		<Spinner
		android:id="@+id/cycles"
		android:layout_width="0dip"
		android:id="@+id/usage_summary"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="1" />

		</LinearLayout>
		android:paddingLeft="16dip"
		android:paddingRight="16dip"
		android:paddingTop="8dip"
		android:paddingBottom="8dip"
		android:textAppearance="?android:attr/textAppearanceSmall" />

		<include layout="@layout/data_usage_chart" />
		<include layout="@layout/data_usage_detail" />

		</LinearLayout>

+6 −4

Original line number	Diff line number	Diff line
		@@ -17,20 +17,22 @@
		<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:padding="8dip"
		android:paddingLeft="16dip"
		android:paddingRight="16dip"
		android:paddingTop="8dip"
		android:paddingBottom="8dip"
		android:columnCount="2">

		<!-- TODO: consider using canShrink -->
		<TextView
		android:id="@android:id/title"
		android:layout_width="0dip"
		android:layout_gravity="fill_horizontal"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:layout_columnFlexibility="canStretch"
		android:textAppearance="?android:attr/textAppearanceMedium" />

		<TextView
		android:id="@android:id/summary"
		android:layout_gravity="right"
		android:layout_marginLeft="8dip"
		android:textAppearance="?android:attr/textAppearanceSmall" />

+2 −0

Original line number	Diff line number	Diff line
		@@ -3468,6 +3468,8 @@ found in the list of installed applications.</string>
		<string name="data_usage_uninstalled_apps">Removed apps</string>
		<!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
		<string name="data_usage_received_sent"><xliff:g id="received" example="128KB">%1$s</xliff:g> received, <xliff:g id="sent" example="1.3GB">%2$s</xliff:g> sent</string>
		<!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
		<string name="data_usage_total_during_range">Data usage: <xliff:g id="total" example="128KB">%1$s</xliff:g> between <xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g></string>

		<!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
		<string name="cryptkeeper_emergency_call">Emergency call</string>