Merge "Data usage performance, bugfixes."

This commit is contained in:
Jeff Sharkey
2011-09-12 16:59:30 -07:00
committed by Android (Google) Code Review
16 changed files with 663 additions and 262 deletions

View File

@@ -17,8 +17,9 @@
<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:layout_height="40dip"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingLeft="@*android:dimen/preference_item_padding_side"
android:paddingRight="@*android:dimen/preference_item_padding_side">

View File

@@ -17,8 +17,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
android:paddingRight="@*android:dimen/preference_fragment_padding_side"
android:orientation="vertical"
android:clipChildren="false"
android:clipToPadding="false">

View File

@@ -16,9 +16,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
android:paddingRight="@*android:dimen/preference_fragment_padding_side">
android:layout_height="wrap_content">
<include layout="@layout/app_percentage_item" />

View File

@@ -3485,13 +3485,13 @@ found in the list of installed applications.</string>
<!-- Body of dialog shown to request confirmation that mobile data will be disabled. [CHAR LIMIT=NONE] -->
<string name="data_usage_disable_mobile">Disable mobile data?</string>
<!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=32] -->
<string name="data_usage_disable_mobile_limit">Disable mobile data at limit</string>
<string name="data_usage_disable_mobile_limit">Set mobile data limit</string>
<!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=32] -->
<string name="data_usage_disable_4g_limit">Disable 4G data at limit</string>
<string name="data_usage_disable_4g_limit">Set 4G data limit</string>
<!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=32] -->
<string name="data_usage_disable_3g_limit">Disable 2G-3G data at limit</string>
<string name="data_usage_disable_3g_limit">Set 2G-3G data limit</string>
<!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=32] -->
<string name="data_usage_disable_wifi_limit">Disable Wi-Fi data at limit</string>
<string name="data_usage_disable_wifi_limit">Set Wi-Fi data limit</string>
<!-- Tab title for showing Wi-Fi data usage. [CHAR LIMIT=10] -->
<string name="data_usage_tab_wifi">Wi-Fi</string>