diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/preference_memoryusage.xml | 5 | ||||
| -rw-r--r-- | res/values/colors.xml | 12 | ||||
| -rwxr-xr-x | res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/device_info_memory.xml | 10 |
5 files changed, 16 insertions, 16 deletions
diff --git a/res/layout/preference_memoryusage.xml b/res/layout/preference_memoryusage.xml index 303a5b71a..60b2ba86e 100644 --- a/res/layout/preference_memoryusage.xml +++ b/res/layout/preference_memoryusage.xml @@ -18,13 +18,12 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="32dip" android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" android:id="@+id/percentage_bar_chart" android:paddingRight="?android:attr/scrollbarSize" - android:paddingTop="6dip" - android:paddingBottom="6dip" settings:minTickWidth="6dip" settings:emptyColor="@color/memory_avail"> + </com.android.settings.deviceinfo.PercentageBarChart> diff --git a/res/values/colors.xml b/res/values/colors.xml index 715a67997..af5595a99 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -18,13 +18,13 @@ <color name="black">#000</color> <color name="red">#F00</color> - <color name="memory_avail">#333</color> - <color name="memory_apps_usage">#FFF</color> <color name="memory_used">#F00</color> - <color name="memory_downloads">#F00</color> - <color name="memory_video">#0F0</color> - <color name="memory_audio">#00F</color> - <color name="memory_misc">#FF0</color> + <color name="memory_avail">#336600</color> + <color name="memory_apps_usage">#99CC00</color> + <color name="memory_downloads">#003399</color> + <color name="memory_video">#993300</color> + <color name="memory_audio">#667788</color> + <color name="memory_misc">#FF6600</color> <color name="crypt_keeper_clock_background">#ff9a9a9a</color> <color name="crypt_keeper_clock_foreground">#ff666666</color> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 5d2aa331f..418121b6b 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -18,5 +18,6 @@ <dimen name="vpn_connect_margin_right">10sp</dimen> <dimen name="vpn_connect_normal_text_size">16sp</dimen> <dimen name="vpn_connect_input_box_label_width">90sp</dimen> - <dimen name="device_memory_usage_button_size">32dip</dimen> + <dimen name="device_memory_usage_button_width">16dip</dimen> + <dimen name="device_memory_usage_button_height">32dip</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index df4f454ea..85bcbd1a5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1565,7 +1565,7 @@ <!-- SD card & phone storage settings title. The amount of free space for some storage partition. For example, this is listed under both the "Internal phone storage" section and the "SD card" section. --> <string name="memory_available">Available</string> <!-- SD card & phone storage settings screen heading. The total amount of storage space for some storage partition. For example, this is listed under both the "Internal phone storage" section and the "SD card" section --> - <string name="memory_size">Total</string> + <string name="memory_size">Total space</string> <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] --> <string name="memory_calculating_size">Calculating…</string> <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] --> diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml index b536d002b..aa3669884 100644 --- a/res/xml/device_info_memory.xml +++ b/res/xml/device_info_memory.xml @@ -38,14 +38,11 @@ <PreferenceCategory android:title="@string/internal_memory"> <com.android.settings.deviceinfo.UsageBarPreference android:key="memory_internal_chart"/> + <Preference android:key="memory_internal_size" android:title="@string/memory_size" android:summary="@string/memory_calculating_size"/> - <Preference android:key="memory_internal_avail" - android:title="@string/memory_available" - android:summary="@string/memory_calculating_size"/> - <Preference android:key="memory_internal_apps" android:title="@string/memory_apps_usage" android:summary="@string/memory_calculating_size"/> @@ -65,6 +62,9 @@ <Preference android:key="memory_internal_media_misc" android:title="@string/memory_media_misc_usage" android:summary="@string/memory_calculating_size"/> - </PreferenceCategory> + <Preference android:key="memory_internal_avail" + android:title="@string/memory_available" + android:summary="@string/memory_calculating_size"/> + </PreferenceCategory> </PreferenceScreen> |