From ff0c73bfcbcf8912cd5fb7b213ef44d92386889b Mon Sep 17 00:00:00 2001
From: Tsung-Mao Fang <tmfang@google.com>
Date: Wed, 2 Jun 2021 20:47:57 +0800
Subject: [PATCH] Fix overlapping problem on running services page

For Android S, all pages support collpasing tool bar.
We add coordinatorLayout to work with collpasing tool bar
layout. And coordinatorLayout only works with RecyclerView
and NestedScrollView.
Unfortunately, the list was implemented by listView many years ago.

Because it's a very hidden page and the page is not maintained anymore,
we don't consider to migrate to RecyclerView.
Simply enable nested scrolling behavior for listview at this moment.

I also make some small refactorings in this cl.
1) Update the layout padding.
2) Format the xml file.
3) Create a individual cl for this page only.

Test: Don't see the overlapping problem
Fix: 188539741
Change-Id: I21c61e35a06b85ca7c309d1d3182b38b4bb38212
---
 res/layout/manage_applications_running.xml | 13 ++--
 res/layout/running_processes_header.xml    |  2 +-
 res/layout/running_processes_item.xml      |  2 +-
 res/layout/running_processes_view.xml      |  1 +
 res/layout/running_services_app_item.xml   | 70 ++++++++++++++++++++++
 5 files changed, 80 insertions(+), 8 deletions(-)
 create mode 100644 res/layout/running_services_app_item.xml

diff --git a/res/layout/manage_applications_running.xml b/res/layout/manage_applications_running.xml
index 6a9d4e53d75..c8d6f92e881 100644
--- a/res/layout/manage_applications_running.xml
+++ b/res/layout/manage_applications_running.xml
@@ -14,14 +14,15 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <FrameLayout
-              android:layout_width="match_parent"
-              android:layout_height="match_parent" >
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
 
         <view class="com.android.settings.applications.RunningProcessesView"
                 android:id="@+id/running_processes"
diff --git a/res/layout/running_processes_header.xml b/res/layout/running_processes_header.xml
index 384c0b692f4..faca2fb05a4 100644
--- a/res/layout/running_processes_header.xml
+++ b/res/layout/running_processes_header.xml
@@ -20,7 +20,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="@dimen/preference_no_icon_padding_start"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:orientation="vertical">
 
diff --git a/res/layout/running_processes_item.xml b/res/layout/running_processes_item.xml
index 6b8547a0dd2..427ef8e815b 100644
--- a/res/layout/running_processes_item.xml
+++ b/res/layout/running_processes_item.xml
@@ -31,5 +31,5 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_toStartOf="@id/widget_summary"
-        layout="@layout/preference_app"/>
+        layout="@layout/running_services_app_item"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/running_processes_view.xml b/res/layout/running_processes_view.xml
index a1cc6abf1ad..4d96ea07965 100644
--- a/res/layout/running_processes_view.xml
+++ b/res/layout/running_processes_view.xml
@@ -33,6 +33,7 @@
             android:paddingEnd="0dp"
             android:drawSelectorOnTop="false"
             android:scrollbarStyle="outsideOverlay"
+            android:nestedScrollingEnabled="true"
             android:fastScrollEnabled="true"/>
         <TextView
             android:id="@android:id/empty"
diff --git a/res/layout/running_services_app_item.xml b/res/layout/running_services_app_item.xml
new file mode 100644
index 00000000000..705d7141e4d
--- /dev/null
+++ b/res/layout/running_services_app_item.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2020 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:background="?android:attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <LinearLayout
+        android:id="@+id/icon_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="start|center_vertical"
+        android:minWidth="@dimen/secondary_app_icon_size"
+        android:orientation="horizontal"
+        android:paddingEnd="16dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp">
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="@dimen/secondary_app_icon_size"
+            android:layout_height="@dimen/secondary_app_icon_size"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:maxLines="2"
+            android:textAppearance="?android:attr/textAppearanceListItem"/>
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textDirection="locale"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"/>
+
+    </LinearLayout>
+
+</LinearLayout>