PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modify Running Services layout

Browse Source 
- Also remove some unused resource

Fixes: 139911198
Test: manual
Change-Id: I70447255df822c5b2a940ecbc3f2fa27707c660b
Screenshot: https://screenshot.googleplex.com/jBEdhunufTb
This commit is contained in:
Raff Tsai
2019-10-24 14:31:54 +08:00
parent 5b4f01e4b2
commit 52ee4888be
13 changed files with 97 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-hdpi/dotted_line_480px.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 135 B

BIN
res/drawable-mdpi/dotted_line_480px.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 129 B

BIN
res/drawable-xhdpi/dotted_line_480px.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 799 B

65
res/layout/preference.xml
View File

@@ -1,65 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2011 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:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:background="?android:attr/selectableItemBackground">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="16dip"
android:paddingBottom="16dip">
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="?android:attr/textColorPrimary"
android:ellipsize="marquee"
android:fadingEdge="horizontal" />
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
android:visibility="gone"
android:textAlignment="viewStart"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="10" />
</RelativeLayout>
<LinearLayout
android:id="@android:id/widget_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:minWidth="58dip"
android:gravity="end|center_vertical"
android:orientation="vertical" />
</LinearLayout>

38
res/layout/preference_widget_two_summary.xml Normal file
View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 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:orientation="vertical"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/widget_summary1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"/>
<TextView
android:id="@+id/widget_summary2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"/>
</LinearLayout>

51
res/layout/running_processes_header.xml
View File

@@ -55,38 +55,29 @@
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@color/running_processes_system_ram" android:src="@color/running_processes_system_ram"
android:contentDescription="@null" /> android:contentDescription="@null" />
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center">
android:orientation="horizontal">
<TextView <TextView
android:id="@+id/systemSizePrefix" android:id="@+id/systemSizePrefix"
android:text="@string/running_processes_header_system_prefix" android:text="@string/running_processes_header_system_prefix"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:layout_alignParentStart="true"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:maxLines="1" /> 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 <TextView
android:id="@+id/systemSize" android:id="@+id/systemSize"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_alignParentEnd="true"
android:maxLines="1" /> android:maxLines="1" />
</LinearLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -100,7 +91,7 @@
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="?android:attr/colorAccent" android:src="?android:attr/colorAccent"
android:contentDescription="@null" /> android:contentDescription="@null" />
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
@@ -113,25 +104,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_alignParentStart="true"
android:maxLines="1" /> android:maxLines="1" />
<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 <TextView
android:id="@+id/appsSize" android:id="@+id/appsSize"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_alignParentEnd="true"
android:maxLines="1" /> android:maxLines="1" />
</LinearLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -145,7 +128,7 @@
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@color/running_processes_free_ram" android:src="@color/running_processes_free_ram"
android:contentDescription="@null" /> android:contentDescription="@null" />
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
@@ -158,25 +141,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_alignParentStart="true"
android:maxLines="1" /> android:maxLines="1" />
<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 <TextView
android:id="@+id/freeSize" android:id="@+id/freeSize"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_alignParentEnd="true"
android:maxLines="1" /> android:maxLines="1" />
</LinearLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
<TextView <TextView

82
res/layout/running_processes_item.xml
View File

@@ -17,71 +17,19 @@
*/ */
--> -->
<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:minHeight="?android:attr/listPreferredItemHeight" <include
android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:layout_width="60dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:layout_height="match_parent"
android:paddingTop="8dip" android:layout_alignParentEnd="true"
android:paddingBottom="8dip" android:id="@+id/widget_summary"
android:columnCount="2"> layout="@layout/preference_widget_two_summary"/>
<include
<ImageView android:layout_width="match_parent"
android:id="@+id/icon" android:layout_height="match_parent"
android:layout_width="@android:dimen/app_icon_size" android:layout_toStartOf="@id/widget_summary"
android:layout_height="@android:dimen/app_icon_size" layout="@layout/preference_material"/>
android:layout_rowSpan="2" </RelativeLayout>
android:layout_marginEnd="8dip"
android:scaleType="centerInside"
android:contentDescription="@null" />
<LinearLayout
android:layout_width="0dip"
android:layout_gravity="fill_horizontal"
android:layout_marginTop="2dip">
<TextView
android:id="@+id/name"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textAlignment="viewStart" />
<TextView
android:id="@+id/size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dip"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" />
</LinearLayout>
<LinearLayout
android:layout_width="0dip"
android:layout_gravity="fill_horizontal|top">
<TextView
android:id="@+id/description"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary"
android:textAlignment="viewStart" />
<TextView
android:id="@+id/uptime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dip"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" />
</LinearLayout>
</GridLayout>

43
res/layout/running_processes_view.xml
View File

@@ -15,26 +15,31 @@
* limitations under the License. * limitations under the License.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:layout_width="match_parent" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent" android:layout_width="match_parent"
android:orientation="vertical"> android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout <FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<ListView
android:id="@android:id/list"
style="@style/PreferenceFragmentListSinglePane"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="match_parent"
android:layout_weight="1"> android:paddingStart="0dp"
<ListView android:id="@android:id/list" android:paddingEnd="0dp"
style="@style/PreferenceFragmentListSinglePane" android:drawSelectorOnTop="false"
android:layout_width="match_parent" android:scrollbarStyle="outsideOverlay"
android:layout_height="match_parent" android:fastScrollEnabled="true"/>
android:drawSelectorOnTop="false" <TextView
android:scrollbarStyle="outsideOverlay" android:id="@android:id/empty"
android:fastScrollEnabled="true" /> android:layout_width="match_parent"
<TextView android:id="@android:id/empty" android:layout_height="match_parent"
android:layout_width="match_parent" android:gravity="center"
android:layout_height="match_parent" android:text="@string/no_running_services"
android:gravity="center" android:textAppearance="?android:attr/textAppearanceLarge"/>
android:text="@string/no_running_services"
android:textAppearance="?android:attr/textAppearanceLarge" />
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>

21
res/layout/separator_label.xml
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2008, 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.
*/
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
style="?android:attr/listSeparatorTextViewStyle" />

29
res/layout/tall_preference_category.xml
View File

@@ -1,29 +0,0 @@
<?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.
-->
<!-- Based on frameworks/base/core/res/res/layout/preference_category_material.xml.
except has paddingBottom set.-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dip"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"
android:textColor="?android:attr/colorAccent"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingBottom="8dp"
android:paddingTop="16dip" />

50
res/layout/widget_text_views.xml
View File

@@ -1,50 +0,0 @@
<?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.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:duplicateParentState="true">
<TextView
android:id="@+id/widget_text1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="fill_horizontal|top"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary"
android:textAlignment="viewStart"
android:singleLine="true"
android:ellipsize="marquee"
android:duplicateParentState="true" />
<TextView
android:id="@+id/widget_text2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="8dip"
android:layout_gravity="fill_horizontal|top"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary"
android:textAlignment="viewEnd"
android:singleLine="true"
android:ellipsize="marquee"
android:duplicateParentState="true" />
</LinearLayout>

10
src/com/android/settings/applications/RunningProcessesView.java
View File

@@ -164,11 +164,11 @@ public class RunningProcessesView extends FrameLayout
public ViewHolder(View v) { public ViewHolder(View v) {
rootView = v; rootView = v;
icon = (ImageView)v.findViewById(R.id.icon); icon = v.findViewById(android.R.id.icon);
name = (TextView)v.findViewById(R.id.name); name = v.findViewById(android.R.id.title);
description = (TextView)v.findViewById(R.id.description); description = v.findViewById(android.R.id.summary);
size = (TextView)v.findViewById(R.id.size); size = v.findViewById(R.id.widget_summary1);
uptime = (TextView)v.findViewById(R.id.uptime); uptime = v.findViewById(R.id.widget_summary2);
v.setTag(this); v.setTag(this);
} }

4
src/com/android/settings/applications/RunningServiceDetails.java
View File

@@ -226,7 +226,7 @@ public class RunningServiceDetails extends InstrumentedFragment
void addServicesHeader() { void addServicesHeader() {
if (mNumServices == 0) { if (mNumServices == 0) {
mServicesHeader = (TextView)mInflater.inflate(R.layout.separator_label, mServicesHeader = (TextView) mInflater.inflate(R.layout.preference_category,
mAllDetails, false); mAllDetails, false);
mServicesHeader.setText(R.string.runningservicedetails_services_title); mServicesHeader.setText(R.string.runningservicedetails_services_title);
mAllDetails.addView(mServicesHeader); mAllDetails.addView(mServicesHeader);
@@ -236,7 +236,7 @@ public class RunningServiceDetails extends InstrumentedFragment
void addProcessesHeader() { void addProcessesHeader() {
if (mNumProcesses == 0) { if (mNumProcesses == 0) {
mProcessesHeader = (TextView)mInflater.inflate(R.layout.separator_label, mProcessesHeader = (TextView) mInflater.inflate(R.layout.preference_category,
mAllDetails, false); mAllDetails, false);
mProcessesHeader.setText(R.string.runningservicedetails_processes_title); mProcessesHeader.setText(R.string.runningservicedetails_processes_title);
mAllDetails.addView(mProcessesHeader); mAllDetails.addView(mProcessesHeader);