diff options
author | Jason Monk <jmonk@google.com> | 2015-03-25 09:46:30 -0400 |
---|---|---|
committer | Jason Monk <jmonk@google.com> | 2015-04-27 10:08:52 -0400 |
commit | 2583fc1e069d0a54df46258d360499492d7e86d2 (patch) | |
tree | 7cd4e7fdd53c3fdc4e5582f377c37719332a6b11 /res/layout | |
parent | c5184ff1af600d0195532b9b6c37505cc2f863f1 (diff) | |
download | packages_apps_Settings-2583fc1e069d0a54df46258d360499492d7e86d2.zip packages_apps_Settings-2583fc1e069d0a54df46258d360499492d7e86d2.tar.gz packages_apps_Settings-2583fc1e069d0a54df46258d360499492d7e86d2.tar.bz2 |
Move process stats screen into memory screen.
- Move process stats from developer options to top level
settings item.
- Some minor UI changes to the top of the page
- Major UI updates to detail page, now shows info with processes
as pref categories and services as prefs, with a way to kill
them (taken from Running Services page).
- Some major refactorings in code, in attempt to make it more
usable
- Added color bar on per app basis to visualize the avg/max
relationship
- Updated the way avg is calculated across multiple entries in
ProcStatsPackageEntry to be more accurate
- Change the way max memory is calculated in
ProcStatsPackageEntry to be less accurate but more useful
Bug: 19443802
Change-Id: Ia6aaabe42c415c50997a09bfb814a6f6e5731772
Diffstat (limited to 'res/layout')
-rwxr-xr-x | res/layout/app_item_linear_color.xml | 74 | ||||
-rw-r--r-- | res/layout/cancel_pref_widget.xml | 22 | ||||
-rw-r--r-- | res/layout/memory_key.xml | 58 | ||||
-rw-r--r-- | res/layout/proc_stats_ui.xml | 55 | ||||
-rw-r--r-- | res/layout/process_preference_category.xml | 39 | ||||
-rw-r--r-- | res/layout/process_stats_details.xml | 76 |
6 files changed, 269 insertions, 55 deletions
diff --git a/res/layout/app_item_linear_color.xml b/res/layout/app_item_linear_color.xml new file mode 100755 index 0000000..62eebb9 --- /dev/null +++ b/res/layout/app_item_linear_color.xml @@ -0,0 +1,74 @@ +<?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:minHeight="?android:attr/listPreferredItemHeight" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingTop="8dip" + android:paddingBottom="8dip"> + + <ImageView + android:id="@android:id/icon" + android:layout_width="@android:dimen/app_icon_size" + android:layout_height="@android:dimen/app_icon_size" + android:layout_marginEnd="8dip" + android:scaleType="centerInside" + android:contentDescription="@null" + android:duplicateParentState="true" /> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="vertical" + android:duplicateParentState="true"> + + <TextView + android:id="@android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="2dip" + android:singleLine="true" + android:ellipsize="marquee" + android:textAppearance="@android:style/TextAppearance.Material.Subhead" + android:textAlignment="viewStart" + android:duplicateParentState="true" /> + + <TextView + android:id="@android:id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="@android:style/TextAppearance.Material.Body1" + android:textColor="?android:attr/textColorSecondary" + android:textAlignment="viewStart" + android:duplicateParentState="true" /> + + </LinearLayout> + + <com.android.settings.applications.LinearColorBar + android:id="@+id/linear_color_bar" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:layout_marginTop="5dp" + android:layout_marginBottom="5dp" + android:duplicateParentState="true" /> + +</LinearLayout> diff --git a/res/layout/cancel_pref_widget.xml b/res/layout/cancel_pref_widget.xml new file mode 100644 index 0000000..0b3ef21 --- /dev/null +++ b/res/layout/cancel_pref_widget.xml @@ -0,0 +1,22 @@ +<?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. +--> +<ImageView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/cancel" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clickable="true" + android:src="@drawable/ic_cancel" + /> diff --git a/res/layout/memory_key.xml b/res/layout/memory_key.xml new file mode 100644 index 0000000..62db2fc --- /dev/null +++ b/res/layout/memory_key.xml @@ -0,0 +1,58 @@ +<?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:gravity="center_vertical|end" + android:layout_marginBottom="5dp" > + + <ImageView + android:layout_width="16dp" + android:layout_height="16dp" + android:scaleType="centerInside" + android:src="@color/memory_avg_use" + android:contentDescription="@null" /> + + <TextView + android:id="@+id/memory_avg" + android:text="@string/memory_avg_use" + android:textAppearance="@android:style/TextAppearance.Material.Body1" + android:textColor="?android:attr/textColorSecondary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginEnd="16dp" /> + + <ImageView + android:layout_width="16dp" + android:layout_height="16dp" + android:scaleType="centerInside" + android:src="@color/memory_max_use" + android:contentDescription="@null" /> + + <TextView + android:id="@+id/memory_max" + android:text="@string/memory_max_use" + android:textAppearance="@android:style/TextAppearance.Material.Body1" + android:textColor="?android:attr/textColorSecondary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginEnd="16dp" /> + +</LinearLayout> diff --git a/res/layout/proc_stats_ui.xml b/res/layout/proc_stats_ui.xml new file mode 100644 index 0000000..5f78178 --- /dev/null +++ b/res/layout/proc_stats_ui.xml @@ -0,0 +1,55 @@ +<?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:id="@+id/all_details" + 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/memory_state" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:layout_marginBottom="10dp" + android:textAppearance="@android:style/TextAppearance.Material.Subhead" + /> + + <com.android.settings.applications.LinearColorBar + android:id="@+id/color_bar" + android:layout_width="match_parent" + android:layout_height="30dp" + /> + + <TextView + android:id="@+id/memory_used" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="2dp" + android:layout_marginBottom="10dp" + android:textAppearance="@android:style/TextAppearance.Material.Small" + android:textColor="?android:attr/textColorSecondary" + /> + + <include layout="@layout/memory_key" /> + +</LinearLayout> + diff --git a/res/layout/process_preference_category.xml b/res/layout/process_preference_category.xml new file mode 100644 index 0000000..18ea23c --- /dev/null +++ b/res/layout/process_preference_category.xml @@ -0,0 +1,39 @@ +<?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. +--> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="16dip" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingTop="16dip"> + <TextView + android:id="@android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="@android:style/TextAppearance.Material.Body2" + android:textColor="?android:attr/colorAccent" /> + + <TextView + android:id="@android:id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:textAppearance="@android:style/TextAppearance.Material.Body2" + android:textColor="?android:attr/colorAccent" /> + +</RelativeLayout> diff --git a/res/layout/process_stats_details.xml b/res/layout/process_stats_details.xml index 738805a..aa402f6 100644 --- a/res/layout/process_stats_details.xml +++ b/res/layout/process_stats_details.xml @@ -14,68 +14,34 @@ limitations under the License. --> -<ScrollView +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/all_details" android:layout_width="match_parent" android:layout_height="match_parent" - android:clipToPadding="false" - android:scrollbarStyle="@integer/preference_scrollbar_style"> + android:orientation="vertical" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> - <LinearLayout - android:id="@+id/all_details" + <com.android.settings.applications.LinearColorBar + android:id="@+id/color_bar" android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="5dip" - android:paddingBottom="5dip" - android:orientation="vertical" - android:paddingStart="?android:attr/listPreferredItemPaddingStart" - android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> - - <include layout="@layout/app_percentage_item" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <!-- Force stop and report buttons --> - <LinearLayout - android:id="@+id/two_buttons_panel" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingBottom="6dip" - android:orientation="vertical"> - - <include layout="@layout/two_buttons_panel"/> - </LinearLayout> - - <LinearLayout - android:id="@+id/processes" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <!-- Insert process items here --> + android:layout_height="40dp" + android:layout_marginTop="12dp" + android:layout_marginBottom="10dp" + /> - </LinearLayout> + <include layout="@layout/memory_key" /> - <TextView - android:id="@+id/services_label" - style="?android:attr/listSeparatorTextViewStyle" - android:text="@string/services_subtitle" /> - - <LinearLayout - android:id="@+id/services" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <!-- Insert service items here --> - - </LinearLayout> - - </LinearLayout> + <!-- Force stop and report buttons --> + <LinearLayout + android:id="@+id/two_buttons_panel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingBottom="6dip" + android:orientation="vertical"> + <include layout="@layout/two_buttons_panel"/> </LinearLayout> -</ScrollView> +</LinearLayout> |