Unbanish memory screen and new UX

Give memory screen a makeover so that it looks nice enough to be
restored to its rightful home.

Bug: 20694769
Change-Id: I2f6933037b3fbbfb0d9fe5e3ca821ef59e171faa

6 files changed, 89 insertions, 10 deletions

diff --git a/res/xml/advanced_apps.xml b/res/xml/advanced_apps.xml
index 1e2d516..b38900b 100644
--- a/res/xml/advanced_apps.xml
+++ b/res/xml/advanced_apps.xml
@@ -49,8 +49,4 @@
             android:value="com.android.settings.Settings$HighPowerApplicationsActivity" />
     </PreferenceScreen>
 
-    <PreferenceScreen
-        android:title="@string/memory_settings_title"
-        android:fragment="com.android.settings.applications.ProcessStatsUi" />
-
 </PreferenceScreen>
diff --git a/res/xml/app_memory_settings.xml b/res/xml/app_memory_settings.xml
index 2c3db21..41de52f 100644
--- a/res/xml/app_memory_settings.xml
+++ b/res/xml/app_memory_settings.xml
@@ -17,8 +17,26 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   android:title="@string/memory_details_title">
 
+    <PreferenceCategory
+        android:title="@string/average_memory_use" />
+
     <com.android.settings.applications.LayoutPreference
-        android:key="details_header"
-        android:layout="@layout/process_stats_details" />
+        android:key="status_header"
+        android:layout="@layout/proc_stats_ui" />
+
+    <Preference
+        android:key="frequency"
+        android:selectable="false"
+        android:layout="@layout/horizontal_preference"
+        android:title="@string/running_frequency" />
+
+    <Preference
+        android:key="max_usage"
+        android:selectable="false"
+        android:layout="@layout/horizontal_preference"
+        android:title="@string/memory_maximum_usage" />
+
+    <com.android.settings.applications.SpacePreference
+        android:layout_height="15dp" />
 
 </PreferenceScreen>
diff --git a/res/xml/app_storage_settings.xml b/res/xml/app_storage_settings.xml
index 5bb9204..7c5c25c 100644
--- a/res/xml/app_storage_settings.xml
+++ b/res/xml/app_storage_settings.xml
@@ -63,9 +63,13 @@
             android:layout="@layout/single_button_panel" />
     </PreferenceCategory>
 
+    <com.android.settings.applications.SpacePreference
+        android:layout_height="8dp" />
+
     <Preference
         android:key="cache_size"
         android:title="@string/cache_size_label"
+        android:selectable="false"
         android:layout="@layout/horizontal_preference" />
 
     <com.android.settings.applications.LayoutPreference
diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
index 14a4db6..5b8c243 100644
--- a/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@ -134,13 +134,13 @@
                 android:icon="@drawable/ic_settings_multiuser"
                 />
 
-        <!-- Memory (hidden for now)
+        <!-- Memory -->
         <dashboard-tile
                 android:id="@+id/manage_memory"
                 android:title="@string/memory_settings_title"
-                android:fragment="com.android.settings.applications.ProcessStatsUi"
+                android:fragment="com.android.settings.applications.ProcessStatsSummary"
                 android:icon="@drawable/ic_settings_memory"
-                /> -->
+                />
 
         <!-- Manage NFC payment apps -->
         <dashboard-tile
diff --git a/res/xml/process_stats_summary.xml b/res/xml/process_stats_summary.xml
index 46bb160..d267272 100644
--- a/res/xml/process_stats_summary.xml
+++ b/res/xml/process_stats_summary.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
+<!-- Copyright (C) 2015 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.
@@ -18,7 +18,43 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/app_memory_use"
     android:key="app_list">
+    <PreferenceCategory
+        android:title="@string/average_memory_use" />
+
     <com.android.settings.applications.LayoutPreference
         android:key="status_header"
+        android:selectable="false"
         android:layout="@layout/proc_stats_ui" />
+
+    <Preference
+        android:key="performance"
+        android:selectable="false"
+        android:layout="@layout/horizontal_preference"
+        android:title="@string/memory_performance" />
+
+    <Preference
+        android:key="total_memory"
+        android:selectable="false"
+        android:layout="@layout/horizontal_preference"
+        android:title="@string/total_memory" />
+
+    <Preference
+        android:key="average_used"
+        android:selectable="false"
+        android:layout="@layout/horizontal_preference"
+        android:title="@string/average_used" />
+
+    <Preference
+        android:key="free"
+        android:selectable="false"
+        android:layout="@layout/horizontal_preference"
+        android:title="@string/free_memory" />
+
+    <com.android.settings.applications.SpacePreference
+        android:layout_height="15dp" />
+
+    <Preference
+        android:key="apps_list"
+        android:title="@string/memory_usage_apps" />
+
 </PreferenceScreen>
diff --git a/res/xml/process_stats_ui.xml b/res/xml/process_stats_ui.xml
new file mode 100644
index 0000000..ba9066e
--- /dev/null
+++ b/res/xml/process_stats_ui.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/app_memory_use">
+
+    <PreferenceCategory
+        android:key="app_list"
+        android:title="@string/average_memory_use" />
+
+</PreferenceScreen>