Merge "Revert "Import translations. DO NOT MERGE"" into pi-dev
diff --git a/res/layout/data_usage_summary_preference.xml b/res/layout/data_usage_summary_preference.xml
index 719db91..bd13d80 100644
--- a/res/layout/data_usage_summary_preference.xml
+++ b/res/layout/data_usage_summary_preference.xml
@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="24dp"
+ android:paddingTop="22dp"
android:paddingBottom="32dp"
android:paddingStart="@dimen/preference_no_icon_padding_start"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
@@ -31,8 +31,7 @@
android:id="@+id/usage_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceListItemSecondary"
- android:textColor="?android:attr/textColorSecondary"
+ android:textColor="?android:attr/colorAccent"
android:text="@string/data_usage_title" />
<LinearLayout
@@ -40,7 +39,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="12dp"
- android:paddingBottom="4dp"
android:orientation="horizontal">
<TextView android:id="@+id/data_usage_view"
@@ -78,7 +76,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="4dp"
- android:paddingBottom="8dp"
android:orientation="horizontal">
<TextView android:id="@android:id/text1"
@@ -100,32 +97,38 @@
</LinearLayout>
- <TextView
- android:id="@+id/cycle_left_time"
- android:paddingTop="4dp"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content"
+ android:paddingTop="12dp"
+ android:orientation="vertical">
- <TextView
- android:id="@+id/carrier_and_update"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ <TextView
+ android:id="@+id/data_limits"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="?android:attr/textColorSecondary" />
+
+ <TextView
+ android:id="@+id/cycle_left_time"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <TextView
+ android:id="@+id/carrier_and_update"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ </LinearLayout>
<Button
android:id="@+id/launch_mdp_app_button"
- android:paddingTop="12dp"
+ android:layout_marginTop="12dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="left"
+ android:layout_gravity="start"
android:text="@string/launch_mdp_app_text"
style="@style/ActionPrimaryButton" />
- <TextView
- android:id="@+id/data_limits"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="5dp"
- android:textColor="?android:attr/textColorSecondary" />
-
</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 41b8b6c..5810569 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -941,7 +941,7 @@
<!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->
<string name="security_settings_fingerprint_enroll_finish_title">Fingerprint added</string>
<!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
- <string name="security_settings_fingerprint_enroll_finish_message">When you see this icon, use your fingerprint for identification or to approve purchases.</string>
+ <string name="security_settings_fingerprint_enroll_finish_message">When you see this icon, use your fingerprint for identification or to approve purchases</string>
<!-- Button text to skip enrollment of fingerprint [CHAR LIMIT=40] -->
<string name="security_settings_fingerprint_enroll_enrolling_skip">Do it later</string>
<!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
@@ -8826,7 +8826,7 @@
<string name="no_carrier_update_text">Updated <xliff:g name="time" example="3m">%1$s</xliff:g></string>
<!-- Button to launch external data plan app [CHAR LIMIT=30] -->
- <string name="launch_mdp_app_text">VIEW PLAN</string>
+ <string name="launch_mdp_app_text">View plan</string>
<!-- Name of Data Saver screens [CHAR LIMIT=30] -->
<string name="data_saver_title">Data saver</string>
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index b05d180..dbc3e59 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -129,14 +129,6 @@
}
@Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- if (UserManager.get(getContext()).isAdminUser()) {
- inflater.inflate(R.menu.data_usage, menu);
- }
- super.onCreateOptionsMenu(menu, inflater);
- }
-
- @Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.data_usage_menu_cellular_networks: {