summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-07-28 17:44:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-28 17:44:19 -0700
commit6fce81a69d7c2891d31618016c8ddc7b08deaa03 (patch)
tree88ee585512c75c1980ed7aae5c43612b1afa2dde /res/xml
parent9248082d0a19a1d1c9b2d70e0be8f78e38ecc657 (diff)
parent508fedc4102790dcd7004e4962e2b540967b714b (diff)
downloadpackages_apps_settings-6fce81a69d7c2891d31618016c8ddc7b08deaa03.zip
packages_apps_settings-6fce81a69d7c2891d31618016c8ddc7b08deaa03.tar.gz
packages_apps_settings-6fce81a69d7c2891d31618016c8ddc7b08deaa03.tar.bz2
am 508fedc4: Improvements to manage apps / running services:
Merge commit '508fedc4102790dcd7004e4962e2b540967b714b' into gingerbread-plus-aosp * commit '508fedc4102790dcd7004e4962e2b540967b714b': Improvements to manage apps / running services:
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/application_settings.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml
index 6ac58d1..27a0411 100644
--- a/res/xml/application_settings.xml
+++ b/res/xml/application_settings.xml
@@ -60,6 +60,14 @@
</PreferenceScreen>
<PreferenceScreen
+ android:title="@string/storageuse_settings_title"
+ android:summary="@string/storageuse_settings_summary">
+ <intent android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.settings"
+ android:targetClass="com.android.settings.applications.StorageUse" />
+ </PreferenceScreen>
+
+ <PreferenceScreen
android:key="power_usage"
android:title="@string/power_usage_summary_title"
android:summary="@string/power_usage_summary">