Merge "Convert install app detail to dashboard fragment." (e48f75b1) · Commits · e / os / android_packages_apps_Settings

res/xml/app_info_settings.xml

0 → 100644

+93 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2017 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"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:key="installed_app_detail_settings_screen"
		app:initialExpandedChildrenCount="6">

		<com.android.settings.applications.LayoutPreference
		android:key="header_view"
		android:layout="@layout/settings_entity_header"
		android:selectable="false"
		android:order="-10000"/>

		<com.android.settings.applications.LayoutPreference
		android:key="instant_app_buttons"
		android:layout="@layout/instant_app_buttons"
		android:selectable="false"
		android:order="-9999"/>

		<com.android.settings.widget.ActionButtonPreference
		android:key="action_buttons"
		android:order="-9998" />

		<Preference
		android:key="notification_settings"
		android:title="@string/notifications_label"
		android:selectable="true"/>

		<com.android.settings.widget.FixedLineSummaryPreference
		android:key="permission_settings"
		android:title="@string/permissions_label"
		android:summary="@string/summary_placeholder"
		android:selectable="true"
		app:summaryLineCount="1" />

		<Preference
		android:key="storage_settings"
		android:title="@string/storage_settings"
		android:summary="@string/summary_placeholder"
		android:selectable="true"/>

		<com.android.settings.applications.AppDomainsPreference
		android:key="instant_app_launch_supported_domain_urls"
		android:title="@string/app_launch_supported_domain_urls_title"
		android:selectable="true" />

		<Preference
		android:key="data_settings"
		android:title="@string/data_usage_summary_title"
		android:summary="@string/summary_placeholder"
		android:selectable="true"/>

		<Preference
		android:key="battery"
		android:title="@string/power_usage_summary_title"
		android:summary="@string/summary_placeholder"
		android:selectable="true"/>

		<Preference
		android:key="preferred_settings"
		android:title="@string/launch_by_default"
		android:summary="@string/summary_placeholder"
		android:selectable="true"/>

		<Preference
		android:key="memory"
		android:title="@string/memory_settings_title"
		android:summary="@string/summary_placeholder"
		android:enabled="false"
		android:selectable="true"/>

		<Preference
		android:key="app_version"
		android:selectable="false"
		android:order="9999"/>

		</PreferenceScreen>
		No newline at end of file

res/xml/notification_settings.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		-->

		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto">
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:title="@string/app_notifications_title">

		</PreferenceScreen>

src/com/android/settings/applications/AppInfoDashboardFragment.java

+97 −452

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/applications/ProcStatsData.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -372,6 +372,10 @@ public class ProcStatsData {
		double totalScale;
		long memTotalTime;

		public double getWeightToRam() {
		return weightToRam;
		}

		private MemInfo(Context context, ProcessStats.TotalMemoryUseCollection totalMem,
		long memTotalTime) {
		this.memTotalTime = memTotalTime;

src/com/android/settings/applications/ProcStatsEntry.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -297,6 +297,10 @@ public final class ProcStatsEntry implements Parcelable {
		}
		}

		public int getUid() {
		return mUid;
		}

		public static final Parcelable.Creator<ProcStatsEntry> CREATOR
		= new Parcelable.Creator<ProcStatsEntry>() {
		public ProcStatsEntry createFromParcel(Parcel in) {