From 124251d54e7c0e3610e87aa72bd84b21750057ed Mon Sep 17 00:00:00 2001
From: Doris Ling <dling@google.com>
Date: Thu, 18 Aug 2016 15:16:23 -0700
Subject: [PATCH] Add scrollbar to Settings app.

Overlay PreferenceTheme to add scrollbar to the view, and also add
scrollbar to the dashboard.

Change-Id: I2273b0825b200048bd1914923b551a593aa1e16d
Fixes: 30204662
Test: manual - Launch Settings and different sub-settings, and verify
that scrollbar is shown for screen that can be scrolled.
---
 res/layout/dashboard.xml | 3 ++-
 res/values/themes.xml    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/layout/dashboard.xml b/res/layout/dashboard.xml
index f1bf2592c67..73a7255c4ef 100644
--- a/res/layout/dashboard.xml
+++ b/res/layout/dashboard.xml
@@ -25,4 +25,5 @@
     android:paddingStart="@dimen/dashboard_padding_start"
     android:paddingEnd="@dimen/dashboard_padding_end"
     android:paddingTop="@dimen/dashboard_padding_top"
-    android:paddingBottom="@dimen/dashboard_padding_bottom"/>
+    android:paddingBottom="@dimen/dashboard_padding_bottom"
+    android:scrollbars="vertical"/>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index e8611135a50..0009bed484a 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -99,6 +99,7 @@
         <item name="@dropdownPreferenceStyle">@style/Preference.DropDown.Material</item>
         <item name="@android:preferenceFragmentStyle">@style/PreferenceFragmentStyle</item>
         <item name="apnPreferenceStyle">@style/ApnPreference</item>
+        <item name="android:scrollbars">vertical</item>
     </style>
 
     <style name="PreferenceTheme.SetupWizard" parent="SetupWizardTheme">