Work on issue #16135174: Apps page "smoke" gradient footer must be removed

New header in running services.  Not yet done.

Change-Id: Ibe2f4145796c7863ec80e0ea2d8d87dc910bac7e

3 files changed, 178 insertions, 92 deletions

diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index ce2b6c6..5bfdb69 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -39,50 +39,6 @@
                     android:text="@string/no_applications"
                     android:textAppearance="?android:attr/textAppearanceLarge" />
         </FrameLayout>
-        <!-- Force layout direction to LTR for now as we want the text to be at the same position in
-             any Locale included the RTL ones. Will need to fix LinearColorBar RTL support later.
-             Please also note the left/right gravities that would also need to be changed for proper
-             RTL support -->
-        <view class="com.android.settings.applications.LinearColorBar"
-                android:id="@+id/storage_color_bar"
-                android:layout_marginStart="@dimen/settings_side_margin"
-                android:layout_marginEnd="@dimen/settings_side_margin"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="-5dp"
-                android:orientation="horizontal"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                android:paddingTop="30dp"
-                android:paddingBottom="1dp"
-                android:layoutDirection="ltr">
-            <TextView android:id="@+id/usedStorageText"
-                android:layout_width="0px"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:textAppearance="?android:attr/textAppearanceSmallInverse"
-                android:textColor="#000"
-                android:singleLine="true" />
-            <TextView android:id="@+id/storageChartLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:layout_marginTop="-20dp"
-                android:textAppearance="?android:attr/textAppearanceSmallInverse"
-                android:textColor="?android:attr/textColorPrimary"
-                android:singleLine="true"
-                android:text="@string/internal_storage" />
-            <TextView android:id="@+id/freeStorageText"
-                android:layout_gravity="center_vertical|end"
-                android:layout_width="0px"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="right"
-                android:textAppearance="?android:attr/textAppearanceSmallInverse"
-                android:textColor="#000"
-                android:singleLine="true" />
-        </view>
     </LinearLayout>
 
     <LinearLayout android:id="@+id/loading_container"
diff --git a/res/layout/running_processes_header.xml b/res/layout/running_processes_header.xml
new file mode 100644
index 0000000..a5a2bc7
--- /dev/null
+++ b/res/layout/running_processes_header.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2014, 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.
+*/
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAlignment="viewStart"
+        android:text="@string/running_processes_header_title" />
+
+    <view class="com.android.settings.applications.LinearColorBar"
+        android:id="@+id/color_bar"
+        android:layout_width="match_parent"
+        android:layout_height="18sp"
+        android:layout_marginTop="8dp"
+        android:orientation="horizontal" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:orientation="horizontal"
+        android:baselineAligned="true">
+        <ImageView
+            android:layout_width="16sp"
+            android:layout_height="16sp"
+            android:scaleType="centerInside"
+            android:baselineAlignBottom="true"
+            android:src="@color/running_processes_system_ram"
+            android:contentDescription="@null" />
+        <TextView
+            android:id="@+id/systemSizePrefix"
+            android:text="@string/running_processes_header_system_prefix"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:maxLines="1" />
+        <ImageView
+            android:src="@drawable/dotted_line_480px"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="1px"
+            android:layout_marginStart="1dip"
+            android:layout_marginEnd="1dip"
+            android:baselineAlignBottom="true"
+            android:scaleType="center"
+            android:contentDescription="@null" />
+        <TextView
+            android:id="@+id/systemSize"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:maxLines="1" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:orientation="horizontal"
+        android:baselineAligned="true">
+        <ImageView
+            android:layout_width="16sp"
+            android:layout_height="16sp"
+            android:baselineAlignBottom="true"
+            android:scaleType="centerInside"
+            android:src="@color/running_processes_apps_ram"
+            android:contentDescription="@null" />
+        <TextView
+            android:id="@+id/appsSizePrefix"
+            android:text="@string/running_processes_header_apps_prefix"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:maxLines="1"
+            android:paddingTop="6dip" />
+        <ImageView
+            android:src="@drawable/dotted_line_480px"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="1px"
+            android:baselineAlignBottom="true"
+            android:layout_marginStart="1dip"
+            android:layout_marginEnd="1dip"
+            android:scaleType="center"
+            android:contentDescription="@null" />
+        <TextView
+            android:id="@+id/appsSize"
+            android:paddingTop="6dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:maxLines="1" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:orientation="horizontal"
+        android:baselineAligned="true">
+        <ImageView
+            android:layout_width="16sp"
+            android:layout_height="16sp"
+            android:baselineAlignBottom="true"
+            android:scaleType="centerInside"
+            android:src="@color/running_processes_free_ram"
+            android:contentDescription="@null" />
+        <TextView
+            android:id="@+id/freeSizePrefix"
+            android:text="@string/running_processes_header_free_prefix"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:maxLines="1"
+            android:paddingTop="6dip" />
+        <ImageView
+            android:src="@drawable/dotted_line_480px"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="1px"
+            android:baselineAlignBottom="true"
+            android:layout_marginStart="1dip"
+            android:layout_marginEnd="1dip"
+            android:scaleType="center"
+            android:contentDescription="@null" />
+        <TextView
+            android:id="@+id/freeSize"
+            android:paddingTop="6dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:maxLines="1" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/listHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAlignment="viewStart"
+        android:text="@string/running_processes_header_footer" />
+
+</LinearLayout>
diff --git a/res/layout/running_processes_view.xml b/res/layout/running_processes_view.xml
index 68967e4..19293ab 100644
--- a/res/layout/running_processes_view.xml
+++ b/res/layout/running_processes_view.xml
@@ -37,52 +37,4 @@
                 android:text="@string/no_running_services"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
     </FrameLayout>
-    <!-- Force layout direction to LTR for now as we want the text to be at the same position in
-         any Locale included the RTL ones. Will need to fix LinearColorBar RTL support later.
-         Please also note the left/right gravities that would also need to be changed for proper
-         RTL support -->
-    <view class="com.android.settings.applications.LinearColorBar"
-            android:id="@+id/color_bar"
-            android:layout_marginStart="@dimen/settings_side_margin"
-            android:layout_marginEnd="@dimen/settings_side_margin"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="-5dp"
-            android:orientation="horizontal"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:paddingTop="30dp"
-            android:paddingStart="4dp"
-            android:paddingEnd="4dp"
-            android:paddingBottom="1dp"
-            android:layoutDirection="ltr">
-        <TextView android:id="@+id/foregroundText"
-            android:layout_width="0px"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:focusable="true"
-            android:gravity="left|bottom"
-            android:textAppearance="?android:attr/textAppearanceSmallInverse"
-            android:textColor="#000"
-            android:singleLine="true" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:layout_marginTop="-20dp"
-            android:textAppearance="?android:attr/textAppearanceSmallInverse"
-            android:textColor="?android:attr/textColorPrimary"
-            android:singleLine="true"
-            android:text="@string/memory" />
-        <TextView android:id="@+id/backgroundText"
-            android:layout_gravity="center_vertical|end"
-            android:layout_width="0px"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:focusable="true"
-            android:gravity="right|bottom"
-            android:textAppearance="?android:attr/textAppearanceSmallInverse"
-            android:textColor="#000"
-            android:singleLine="true" />
-    </view>
 </LinearLayout>