diff options
| author | Dan Morrill <morrildl@google.com> | 2010-10-18 15:23:16 -0700 |
|---|---|---|
| committer | Dan Morrill <morrildl@google.com> | 2010-10-18 15:23:16 -0700 |
| commit | 45e30006664ecbf527c72b859f71e30c83cee04b (patch) | |
| tree | 554d22faf16ec617ff207e07c9d118d31a212121 /res/xml/device_info_memory.xml | |
| parent | 5565b9ee032d39cbecfd957bc3baf20d1b4e7954 (diff) | |
| parent | 593a7049f52d46a4e47162e2e3f2c5730e8ccfd8 (diff) | |
| download | packages_apps_Settings-45e30006664ecbf527c72b859f71e30c83cee04b.tar.gz packages_apps_Settings-45e30006664ecbf527c72b859f71e30c83cee04b.tar.bz2 packages_apps_Settings-45e30006664ecbf527c72b859f71e30c83cee04b.zip | |
Merge commit '593a7049f52d46a4e47162e2e3f2c5730e8ccfd8' into mergefix
Conflicts:
res/values/strings.xml
src/com/android/settings/deviceinfo/Memory.java
Change-Id: Id481ad234f2e74bdef66ea9485a548f11f0cab84
Diffstat (limited to 'res/xml/device_info_memory.xml')
| -rw-r--r-- | res/xml/device_info_memory.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml index 7bce41c98..56fe08769 100644 --- a/res/xml/device_info_memory.xml +++ b/res/xml/device_info_memory.xml @@ -17,7 +17,8 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/storage_settings_title"> - <PreferenceCategory android:title="@string/sd_memory"> + <PreferenceCategory android:key="memory_sd" + android:title="@string/sd_memory"> <Preference android:key="memory_sd_size" style="?android:attr/preferenceInformationStyle" android:title="@string/memory_size" |