Merge "Remove odd spacing after the divider" into qt-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
fb250122f8
@@ -43,6 +43,7 @@
|
||||
<!-- Empty category to draw divider -->
|
||||
<PreferenceCategory
|
||||
android:key="recent_apps_divider"
|
||||
android:layout="@layout/preference_category_no_label"
|
||||
android:order="-997"/>
|
||||
|
||||
<!-- Notifications (appears before manage_perms), default apps (appears after) -->
|
||||
|
@@ -28,6 +28,7 @@
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="location_advanced_settings"
|
||||
android:layout="@layout/preference_category_no_label"
|
||||
settings:initialExpandedChildrenCount="2">
|
||||
|
||||
<!-- This preference category gets removed if new_recent_location_ui is disabled -->
|
||||
@@ -54,7 +55,8 @@
|
||||
android:selectable="true" />
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="location_services" />
|
||||
android:key="location_services"
|
||||
android:layout="@layout/preference_category_no_label"/>
|
||||
|
||||
<!-- This preference gets removed if there is no managed profile -->
|
||||
<PreferenceCategory
|
||||
@@ -65,5 +67,6 @@
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="location_footer"
|
||||
android:layout="@layout/preference_category_no_label"
|
||||
settings:allowDividerAbove="false"/>
|
||||
</PreferenceScreen>
|
||||
|
@@ -64,7 +64,8 @@
|
||||
|
||||
<!-- Privacy Service -->
|
||||
<PreferenceCategory
|
||||
android:key="privacy_services"/>
|
||||
android:key="privacy_services"
|
||||
android:layout="@layout/preference_category_no_label"/>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="dashboard_tile_placeholder"/>
|
||||
|
@@ -96,7 +96,8 @@
|
||||
|
||||
<PreferenceCategory
|
||||
android:order="40"
|
||||
android:key="security_settings_device_admin_category">
|
||||
android:key="security_settings_device_admin_category"
|
||||
android:layout="@layout/preference_category_no_label">
|
||||
|
||||
<Preference
|
||||
android:key="manage_device_admin"
|
||||
|
Reference in New Issue
Block a user