55c8c9b86c
This change updates the Memory use UI in developer settings to hide
memory fields by default if the AppProfiler PSS deprecation flag is
enabled. A toggle is provided to resume PSS profiling and reinstate the
memory fields, and shows a dialog to reboot if the toggle is updated.
The summary for the "Memory" button in developer settings will show
"Memory profiling disabled" instead of "Avg X GB of Y memory used" if
PSS profiling is not enabled.
Test: With the flag enabled, flash and verify that:
- The memory fields are hidden by default, and the summary shows
the expected "Memory profiling disabled" text
- Clicking the toggle shows the reboot dialog, which will
correctly change the setting and reboot if accepted, and keep
the setting and not reboot if denied
- Check that AppProfiler correctly profiles PSS or RSS based on
the state of the toggle, which persists across reboots
- Included UI test for Memory page elements based on flag value.
Bug: 296454553
Change-Id: Ie21791502445a321446cb8110e5800089f47ac58
71 lines
2.4 KiB
XML
71 lines
2.4 KiB
XML
<?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.
|
|
-->
|
|
|
|
<PreferenceScreen
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:title="@string/app_memory_use"
|
|
android:key="app_list">
|
|
|
|
<SwitchPreference
|
|
android:key="force_enable_pss_profiling"
|
|
android:title="@string/force_enable_pss_profiling_title"
|
|
android:summary="@string/force_enable_pss_profiling_summary" />
|
|
|
|
<PreferenceCategory
|
|
android:title="@string/average_memory_use"
|
|
android:key="memory_info">
|
|
|
|
<com.android.settings.SummaryPreference
|
|
android:key="status_header"
|
|
android:selectable="false" />
|
|
|
|
<com.android.settings.applications.SpacePreference
|
|
android:layout_height="5dp" />
|
|
|
|
<Preference
|
|
android:key="performance"
|
|
android:selectable="false"
|
|
android:layout="@layout/horizontal_preference"
|
|
android:title="@string/memory_performance" />
|
|
|
|
<Preference
|
|
android:key="total_memory"
|
|
android:selectable="false"
|
|
android:layout="@layout/horizontal_preference"
|
|
android:title="@string/total_memory" />
|
|
|
|
<Preference
|
|
android:key="average_used"
|
|
android:selectable="false"
|
|
android:layout="@layout/horizontal_preference"
|
|
android:title="@string/average_used" />
|
|
|
|
<Preference
|
|
android:key="free"
|
|
android:selectable="false"
|
|
android:layout="@layout/horizontal_preference"
|
|
android:title="@string/free_memory" />
|
|
|
|
<com.android.settings.applications.SpacePreference
|
|
android:layout_height="15dp" />
|
|
|
|
<Preference
|
|
android:key="apps_list"
|
|
android:title="@string/memory_usage_apps" />
|
|
|
|
</PreferenceCategory>
|
|
</PreferenceScreen>
|