diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/settings_storage_miscfiles.xml | 55 | ||||
| -rw-r--r-- | res/layout/settings_storage_miscfiles_list.xml | 32 | ||||
| -rw-r--r-- | res/menu/misc_files_menu.xml | 25 | ||||
| -rw-r--r-- | res/values/colors.xml | 9 | ||||
| -rwxr-xr-x | res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 23 | ||||
| -rw-r--r-- | res/xml/device_info_memory.xml | 23 |
7 files changed, 159 insertions, 9 deletions
diff --git a/res/layout/settings_storage_miscfiles.xml b/res/layout/settings_storage_miscfiles.xml new file mode 100644 index 0000000..7c52efa --- /dev/null +++ b/res/layout/settings_storage_miscfiles.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<com.android.settings.deviceinfo.FileItemInfoLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:paddingRight="?android:attr/scrollbarSize" + android:background="?android:attr/selectableItemBackground" + android:gravity="center_vertical" + android:focusable="true"> + + <CheckBox android:id="@+id/misc_checkbox" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentLeft="true" + android:paddingLeft="16dip" + android:scaleType="fitCenter" + android:layout_centerVertical="true"/> + + <TextView android:id="@+id/misc_filename" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/misc_checkbox" + android:maxLines="1" + android:paddingLeft="16dip" + android:textAppearance="?android:attr/textAppearanceSmall"/> + + <TextView android:id="@+id/misc_filesize" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/misc_checkbox" + android:layout_below="@id/misc_filename" + android:maxLines="1" + android:paddingLeft="16dip" + android:textStyle="bold" + android:textAppearance="?android:attr/textAppearanceSmall" /> +</com.android.settings.deviceinfo.FileItemInfoLayout> + diff --git a/res/layout/settings_storage_miscfiles_list.xml b/res/layout/settings_storage_miscfiles_list.xml new file mode 100644 index 0000000..5f8c5ed --- /dev/null +++ b/res/layout/settings_storage_miscfiles_list.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingRight="16dip" + android:paddingLeft="16dip"> + + <ListView android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + +</FrameLayout> + diff --git a/res/menu/misc_files_menu.xml b/res/menu/misc_files_menu.xml new file mode 100644 index 0000000..80fdd2f --- /dev/null +++ b/res/menu/misc_files_menu.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+id/action_delete" + android:title="@string/delete" + android:icon="@android:drawable/ic_menu_delete"/> + <item android:id="@+id/action_select_all" + android:title="@string/select_all" + android:showAsAction="ifRoom" /> +</menu> + diff --git a/res/values/colors.xml b/res/values/colors.xml index 0b8beb6..715a679 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -19,9 +19,12 @@ <color name="red">#F00</color> <color name="memory_avail">#333</color> - <color name="memory_media_usage">#F33</color> - <color name="memory_apps_usage">#3F3</color> - <color name="memory_used">#FFF</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="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 80a4a37..5d2aa33 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -18,4 +18,5 @@ <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> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index f4ecc63..b481ffe 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1566,10 +1566,18 @@ <string name="memory_size">Total</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=30] --> + <!-- 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] --> <string name="memory_apps_usage">Applications</string> - <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=30] --> + <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] --> <string name="memory_media_usage">Media</string> + <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of /sdcard/Download on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] --> + <string name="memory_downloads_usage">Downloads</string> + <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of all pictures, videos in /sdcard/DCIM, /sdcard/Pictures folders on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] --> + <string name="memory_dcim_usage">Pictures, Videos</string> + <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] --> + <string name="memory_music_usage">Audio (music, ringtones, podcasts etc)</string> + <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] --> + <string name="memory_media_misc_usage">Misc.</string> <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card. This will be done before the user phyiscally removes the SD card from the phone. Kind of like the "Safely remove" on some operating systems. [CHAR LIMIT=25] --> <string name="sd_eject" product="nosdcard">Unmount shared storage</string> <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card. This will be done before the user phyiscally removes the SD card from the phone. Kind of like the "Safely remove" on some operating systems. --> @@ -3257,4 +3265,15 @@ found in the list of installed applications.</string> <!-- This error message is displayed when the vpn profile is going to be saved but the vpn service is busy [CHAR LIMIT=NONE] --> <string name="service_busy">Service busy, try again</string> + <!-- the following are for Settings Storage screen --> + <!-- Menu item/button 'delete' --> + <string name="delete">Delete</string> + <!-- Misc files [CHAR LIMIT=25] --> + <string name="misc_files">Misc Files</string> + <!-- number of misc files selected [CHAR LIMIT=20] --> + <string name="misc_files_selected_count">selected</string> + <!-- the string 'out of' displayed when saying "selected N out of M" [CHAR LIMIT=20] --> + <string name="misc_files_selected_count_out_of">out of</string> + <!-- action to select all [CHAR LIMIT=30] --> + <string name="select_all">Select All</string> </resources> diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml index 368862a..b536d00 100644 --- a/res/xml/device_info_memory.xml +++ b/res/xml/device_info_memory.xml @@ -41,14 +41,29 @@ <Preference android:key="memory_internal_size" android:title="@string/memory_size" android:summary="@string/memory_calculating_size"/> - <Preference android:key="memory_internal_media" - android:title="@string/memory_media_usage" + + <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"/> - <Preference android:key="memory_internal_avail" - android:title="@string/memory_available" + + <Preference android:key="memory_internal_downloads" + android:title="@string/memory_downloads_usage" + android:summary="@string/memory_calculating_size"/> + + <Preference android:key="memory_internal_dcim" + android:title="@string/memory_dcim_usage" + android:summary="@string/memory_calculating_size"/> + + <Preference android:key="memory_internal_music" + android:title="@string/memory_music_usage" + android:summary="@string/memory_calculating_size"/> + + <Preference android:key="memory_internal_media_misc" + android:title="@string/memory_media_misc_usage" android:summary="@string/memory_calculating_size"/> </PreferenceCategory> |