Change CBD layout and texts

chrome/android/java/res/values/attrs.xml

Index: chrome/android/java/res/values/attrs.xml
diff --git a/chrome/android/java/res/values/attrs.xml b/chrome/android/java/res/values/attrs.xml
index cbcf2b99effd8d1f4fdd94d85301e75da44272e4..ebfe846227354af1128def5ebde18e6ec6fcbb3e 100644
--- a/chrome/android/java/res/values/attrs.xml
+++ b/chrome/android/java/res/values/attrs.xml
@@ -71,6 +71,6 @@
     </declare-styleable>
 
     <declare-styleable name="SpinnerPreference">
-        <attr name="singleLine" format="boolean" />
+        <attr name="customLayout" format="boolean" />

[Theresa, 2017/03/24 17:15:36]

The name "customLayout" implies that I can set a layout using the customLayout
attribute in XML. If we're going with customLayout, let's make this a
"reference" instead of a boolean so that in XML we can do this:

chrome:customLayout="@layout/clear_browsing_data_preference_spinner"


Alternatively, singleLine feels more re-usable to be than a "custom" layout. I
think it's okay if the singleLine layout adapts on small screens when there
isn't enough space as long as it's well documented.

[dullweber, 2017/03/27 14:11:04]

OK, I will change it back to "singleLine". I was unsure if that is still a good
name if the control uses two lines on a small screen.

     </declare-styleable>
 </resources>