From 868eb6410d8a3b84af81928b549fe87c39684931 Mon Sep 17 00:00:00 2001
From: Yanting Yang <yantingyang@google.com>
Date: Tue, 2 Feb 2021 20:17:03 +0800
Subject: [PATCH] Fix divider missing with AppButtonsPreference

Symptom:
The divider below of the AppButtonsPreference is missing on the
Storage & cache and Battery pages of app.

Root cause:
The PreferenceCategory divider has been hidden for Android S design.
If we put the AppButtonsPreference and the PreferenceCategory together,
the divider will be default hidden by PreferenceCategory.

Solution:
To add back the divider for AppButtonsPreference, override the
allowDividerAbove in the PreferenceCategory.

Fixes: 179118594
Test: visual
Change-Id: I74ba7679a69a578a87734b9920f53a20c79d6567
---
 res/xml/app_storage_settings.xml | 2 +-
 res/xml/power_usage_detail.xml   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/xml/app_storage_settings.xml b/res/xml/app_storage_settings.xml
index 376f09e9852..6092dbbece2 100644
--- a/res/xml/app_storage_settings.xml
+++ b/res/xml/app_storage_settings.xml
@@ -42,7 +42,7 @@
     <PreferenceCategory
         android:key="storage_category"
         android:title="@string/app_info_storage_title"
-        settings:allowDividerBelow="false">
+        settings:allowDividerAbove="true">
 
         <Preference
             android:key="app_size"
diff --git a/res/xml/power_usage_detail.xml b/res/xml/power_usage_detail.xml
index 945ceed8938..95c1038c8f1 100644
--- a/res/xml/power_usage_detail.xml
+++ b/res/xml/power_usage_detail.xml
@@ -31,7 +31,8 @@
         android:order="-9999"/>
 
     <PreferenceCategory
-        android:title="@string/battery_detail_manage_title">
+        android:title="@string/battery_detail_manage_title"
+        settings:allowDividerAbove="true">
 
         <com.android.settingslib.RestrictedPreference
             android:key="background_activity"