More memory updates
- Some string changes
- Make processes in memory details not clickable
- Put processes in a 'detail' category
- Hide processes when an app only has 1
- Add memory item to bottom of app info page
Bug: 20694769
Change-Id: Ifbe2205aeef230e44752d075578524249b30bdf8
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5437767..49aa99f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6664,6 +6664,21 @@
<!-- Label for maximum memory use section [CHAR LIMIT=30] -->
<string name="maximum_memory_use">Maximum memory use</string>
+ <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+ <string name="memory_usage">Memory usage</string>
+
+ <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+ <string name="app_list_memory_use">App usage</string>
+
+ <!-- Label for details about an app's memory use [CHAR LIMIT=30] -->
+ <string name="memory_details">Details</string>
+
+ <!-- Summary for how much memory an app has used [CHAR LIMIT=NONE] -->
+ <string name="memory_use_summary"><xliff:g id="size" example="30MB">%1$s</xliff:g> avg memory used in last 3 hours</string>
+
+ <!-- Summary for no memory use for an app [CHAR LIMIT=NONE] -->
+ <string name="no_memory_use_summary">No memory used in last 3 hours</string>
+
<!-- Menu item for Sorting list by average memory use [CHAR LIMIT=NONE]-->
<string name="sort_avg_use">Sort by avg use</string>
diff --git a/res/xml/app_memory_settings.xml b/res/xml/app_memory_settings.xml
index 41de52f..03ce0ff 100644
--- a/res/xml/app_memory_settings.xml
+++ b/res/xml/app_memory_settings.xml
@@ -15,7 +15,7 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/memory_details_title">
+ android:title="@string/memory_usage">
<PreferenceCategory
android:title="@string/average_memory_use" />
@@ -36,7 +36,8 @@
android:layout="@layout/horizontal_preference"
android:title="@string/memory_maximum_usage" />
- <com.android.settings.applications.SpacePreference
- android:layout_height="15dp" />
+ <PreferenceCategory
+ android:key="processes"
+ android:title="@string/memory_details" />
</PreferenceScreen>
diff --git a/res/xml/installed_app_details.xml b/res/xml/installed_app_details.xml
index deab13b..470e292 100644
--- a/res/xml/installed_app_details.xml
+++ b/res/xml/installed_app_details.xml
@@ -51,4 +51,10 @@
android:title="@string/power_usage_summary_title"
android:selectable="true" />
+ <Preference
+ android:key="memory"
+ android:title="@string/memory_settings_title"
+ android:enabled="false"
+ android:selectable="true" />
+
</PreferenceScreen>