PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed "Primary data" text style and rearranged UI vertically." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-21 00:39:20 +00:00
committed by Android (Google) Code Review
parent f089fb2413 dde458c031
commit 9055c1b655
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
res/layout/data_usage_summary_preference.xml
View File

@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="24dp" android:paddingTop="22dp"
android:paddingBottom="32dp" android:paddingBottom="32dp"
android:paddingStart="@dimen/preference_no_icon_padding_start" android:paddingStart="@dimen/preference_no_icon_padding_start"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
@@ -31,8 +31,7 @@
android:id="@+id/usage_title" android:id="@+id/usage_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceListItemSecondary" android:textColor="?android:attr/colorAccent"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/data_usage_title" /> android:text="@string/data_usage_title" />
<LinearLayout <LinearLayout
@@ -40,7 +39,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingBottom="4dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView android:id="@+id/data_usage_view" <TextView android:id="@+id/data_usage_view"
@@ -78,7 +76,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingBottom="8dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView android:id="@android:id/text1" <TextView android:id="@android:id/text1"
@@ -100,32 +97,38 @@
</LinearLayout> </LinearLayout>
<TextView <LinearLayout
android:id="@+id/cycle_left_time"
android:paddingTop="4dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:paddingTop="12dp"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/carrier_and_update" android:id="@+id/data_limits"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> 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 <Button
android:id="@+id/launch_mdp_app_button" android:id="@+id/launch_mdp_app_button"
android:paddingTop="12dp" android:layout_marginTop="12dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="left" android:layout_gravity="start"
android:text="@string/launch_mdp_app_text" android:text="@string/launch_mdp_app_text"
style="@style/ActionPrimaryButton" /> 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> </LinearLayout>

2
res/values/strings.xml
View File

@@ -8826,7 +8826,7 @@
<string name="no_carrier_update_text">Updated <xliff:g name="time" example="3m">%1$s</xliff:g></string> <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] --> <!-- 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] --> <!-- Name of Data Saver screens [CHAR LIMIT=30] -->
<string name="data_saver_title">Data saver</string> <string name="data_saver_title">Data saver</string>