Implement additional parts of the new ui for CBD.

chrome/android/java/src/org/chromium/chrome/browser/preferences/SpinnerPreference.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.preferences;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.preference.Preference;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
 
 import org.chromium.chrome.R;
 
 /**
  * A preference that takes value from a specified list of objects, presented as a dropdown.
  */
 public class SpinnerPreference extends Preference {
     private Spinner mSpinner;
     private ArrayAdapter<Object> mAdapter;
     private int mSelectedIndex;
     private View mView;
 
     /**
      * Constructor for inflating from XML.
      */
     public SpinnerPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-        setLayoutResource(R.layout.preference_spinner);
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SpinnerPreference);
+        boolean single_line = a.getBoolean(R.styleable.SpinnerPreference_singleLine, false);
+        if (single_line) {
+            setLayoutResource(R.layout.preference_spinner_single_line);
+        } else {
+            setLayoutResource(R.layout.preference_spinner);
+        }
     }
 
     /**
      * Provides a list of arbitrary objects to be shown in the spinner. Visually, each option will
      * be presented as its toString() text.
      * @param options The options to be shown in the spinner.
      * @param selectedIndex Index of the initially selected option.
      */
     public void setOptions(Object[] options, int selectedIndex) {
-        mAdapter = new ArrayAdapter<Object>(
-                getContext(), android.R.layout.simple_spinner_item, options);
+        mAdapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_item, options);
         mAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         mSelectedIndex = selectedIndex;
     }
 
     /**
      * @return The currently selected option.
      */
     public Object getSelectedOption() {
         if (mSpinner == null) return null;
         return mSpinner.getSelectedItem();
@@ skipping 32 matching lines @@
 
         // Screen readers notice the setAdapter() call and announce it. We do not want the spinner
         // to be announced every time the view is bound (e.g. when the user scrolls away from it
         // and then back). Therefore, only update the adapter if it has actually changed.
         if (mSpinner.getAdapter() != mAdapter) {
             mSpinner.setAdapter(mAdapter);
         }
         mSpinner.setSelection(mSelectedIndex);
     }
 }