diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/app_percentage_item.xml (renamed from res/layout/data_usage_item.xml) | 13 | ||||
| -rw-r--r-- | res/layout/power_usage_details.xml | 61 | ||||
| -rw-r--r-- | res/values/strings.xml | 5 |
3 files changed, 17 insertions, 62 deletions
diff --git a/res/layout/data_usage_item.xml b/res/layout/app_percentage_item.xml index d5c2e7f..c134949 100644 --- a/res/layout/data_usage_item.xml +++ b/res/layout/app_percentage_item.xml @@ -17,6 +17,7 @@ <GridLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" android:paddingLeft="@*android:dimen/preference_item_padding_side" android:paddingRight="@*android:dimen/preference_item_padding_side" android:paddingTop="8dip" @@ -27,7 +28,7 @@ android:id="@android:id/icon" android:layout_width="48dip" android:layout_height="48dip" - android:layout_rowSpan="2" + android:layout_rowSpan="3" android:layout_marginRight="8dip" android:scaleType="centerInside" /> @@ -40,7 +41,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView - android:id="@android:id/summary" + android:id="@android:id/text1" android:layout_marginLeft="8dip" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -54,4 +55,12 @@ android:progressDrawable="@drawable/data_usage_bar" style="?android:attr/progressBarStyleHorizontal" /> + <TextView + android:id="@android:id/summary" + android:layout_columnSpan="2" + android:layout_gravity="fill_horizontal" + android:layout_marginTop="4dip" + android:visibility="gone" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </GridLayout> diff --git a/res/layout/power_usage_details.xml b/res/layout/power_usage_details.xml index 23be53f..99567a1 100644 --- a/res/layout/power_usage_details.xml +++ b/res/layout/power_usage_details.xml @@ -26,66 +26,7 @@ android:paddingBottom="5dip" android:orientation="vertical"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" - android:orientation="horizontal" - android:gravity="center_vertical" - android:paddingLeft="12dip" - android:paddingRight="?android:attr/scrollbarSize"> - - <ImageView - android:id="@+id/icon" - android:layout_width="48dip" - android:layout_height="wrap_content" - android:layout_marginRight="6dip" - android:layout_gravity="center" /> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="8dip" - android:layout_marginTop="2dip" - android:layout_marginBottom="6dip" - android:layout_weight="1"> - - <TextView android:id="@+id/name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:layout_marginTop="2dip" - android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" - android:layout_toLeftOf="@+id/battery_percentage" - android:ellipsize="marquee" - android:textAppearance="?android:attr/textAppearanceMedium"/> - <TextView android:id="@+id/battery_percentage" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:layout_alignParentRight="true" - android:layout_alignBottom="@+id/name" - android:layout_gravity="bottom" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textStyle="bold"/> - <ImageView - android:id="@+id/gauge" - android:background="#80404040" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:layout_marginTop="5dip" - android:layout_below="@id/battery_percentage" - android:layout_gravity="center_vertical" /> - <TextView android:id="@+id/summary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignLeft="@id/gauge" - android:layout_below="@id/gauge" - android:textAppearance="?android:attr/textAppearanceSmall" - /> - </RelativeLayout> - </LinearLayout> + <include layout="@layout/app_percentage_item" /> <!-- Force stop and report buttons --> <LinearLayout diff --git a/res/values/strings.xml b/res/values/strings.xml index e39da52..ddf75df 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3470,6 +3470,8 @@ found in the list of installed applications.</string> <!-- Label for data usage occuring while application in background. [CHAR LIMIT=48] --> <string name="data_usage_label_background">Background</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> <!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=32] --> @@ -3675,4 +3677,7 @@ found in the list of installed applications.</string> <!-- Button label for cancelling the new-password operation and retaining the user's previous full-backup password --> <string name="backup_pw_cancel_button_text">Cancel</string> + <!-- Representation of a numerical percentage. [CHAR LIMIT=8] --> + <string name="percentage"><xliff:g id="number" example="30">%d</xliff:g>%%</string> + </resources> |