Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev am: c8c066dedf

am: b7c880a709

Change-Id: I5c999a35fe83be87598b9c7374a0b13ae327130e
This commit is contained in:
Fan Zhang
2017-04-14 18:48:18 +00:00
committed by android-build-merger

View File

@@ -18,26 +18,25 @@
android:title="@string/memory_usage">
<PreferenceCategory
android:title="@string/average_memory_use"/>
android:title="@string/average_memory_use">
<com.android.settings.SummaryPreference
android:key="status_header"
android:selectable="false" />
<com.android.settings.SummaryPreference
android:key="status_header"
android:selectable="false" />
<com.android.settings.applications.SpacePreference
android:layout_height="5dp" />
<Preference
android:key="frequency"
android:selectable="false"
android:layout="@layout/horizontal_preference"
android:title="@string/running_frequency" />
<Preference
android:key="frequency"
android:selectable="false"
android:layout="@layout/horizontal_preference"
android:title="@string/running_frequency" />
<Preference
android:key="max_usage"
android:selectable="false"
android:layout="@layout/horizontal_preference"
android:title="@string/memory_maximum_usage" />
<Preference
android:key="max_usage"
android:selectable="false"
android:layout="@layout/horizontal_preference"
android:title="@string/memory_maximum_usage" />
</PreferenceCategory>
<PreferenceCategory
android:key="processes"