Merge "Remove the horizontal divider around ActionButtonsPreference" into sc-dev

This commit is contained in:
Yanting Yang
2021-05-21 06:22:01 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 18 deletions

View File

@@ -24,27 +24,18 @@
android:key="header_view" android:key="header_view"
android:layout="@layout/settings_entity_header" android:layout="@layout/settings_entity_header"
android:selectable="false" android:selectable="false"
android:order="-10000" android:order="-10000" />
settings:allowDividerBelow="true"/>
<com.android.settingslib.widget.LayoutPreference <com.android.settingslib.widget.LayoutPreference
android:key="instant_app_buttons" android:key="instant_app_buttons"
android:layout="@layout/instant_app_buttons" android:layout="@layout/instant_app_buttons"
android:selectable="false" android:selectable="false"
android:order="-9999" android:order="-9999" />
settings:allowDividerAbove="true"
settings:allowDividerBelow="true"/>
<com.android.settingslib.widget.ActionButtonsPreference <com.android.settingslib.widget.ActionButtonsPreference
android:key="action_buttons" android:key="action_buttons"
android:order="-9998" /> android:order="-9998" />
<!-- Add SpacePreference to draw divider -->
<com.android.settings.applications.SpacePreference
android:layout_height="0dp"
android:order="-9997"
settings:allowDividerAbove="true" />
<Preference <Preference
android:key="app_settings_link" android:key="app_settings_link"
android:title="@string/app_settings_link" android:title="@string/app_settings_link"

View File

@@ -22,11 +22,6 @@
<com.android.settingslib.widget.ActionButtonsPreference <com.android.settingslib.widget.ActionButtonsPreference
android:key="header_view" /> android:key="header_view" />
<com.android.settings.applications.SpacePreference
android:key="storage_space"
android:layout_height="8dp"
settings:allowDividerAbove="true"/>
<Preference <Preference
android:key="storage_used" android:key="storage_used"
android:title="@string/storage_used" android:title="@string/storage_used"
@@ -41,8 +36,7 @@
<PreferenceCategory <PreferenceCategory
android:key="storage_category" android:key="storage_category"
android:title="@string/app_info_storage_title" android:title="@string/app_info_storage_title">
settings:allowDividerAbove="true">
<Preference <Preference
android:key="app_size" android:key="app_size"