Add title and its holo background for settings.

bug:3226752
Change-Id: I10d2430fb2db9283fa080284f9ad6c043d056865

1 files changed, 4 insertions, 12 deletions

diff --git a/src/com/android/camera/ui/OtherSettingsPopup.java b/src/com/android/camera/ui/OtherSettingsPopup.java
index 099bae4..e5dc7ec 100644
--- a/src/com/android/camera/ui/OtherSettingsPopup.java
+++ b/src/com/android/camera/ui/OtherSettingsPopup.java
@@ -29,7 +29,7 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
 /* A popup window that contains several camera settings. */
-public class OtherSettingsPopup extends LinearLayout
+public class OtherSettingsPopup extends AbstractSettingPopup
         implements InLineSettingPicker.Listener {
     private static final String TAG = "OtherSettingsPopup";
     private Listener mListener;
@@ -44,26 +44,18 @@ public class OtherSettingsPopup extends LinearLayout
 
     public OtherSettingsPopup(Context context, AttributeSet attrs) {
         super(context, attrs);
-
-        // Use system holo background.
-        Theme dialogTheme = getResources().newTheme();
-        dialogTheme.applyStyle(android.R.style.Theme_Holo_Dialog, true);
-        TypedArray ta = dialogTheme.obtainStyledAttributes(new int[] {
-                android.R.attr.windowBackground });
-        setBackgroundDrawable(ta.getDrawable(0));
-        ta.recycle();
     }
 
     public void initialize(PreferenceGroup group) {
         // Initialize each camera setting.
-        for (int i = getChildCount() - 1; i >= 0; i--) {
-            InLineSettingPicker picker = (InLineSettingPicker) getChildAt(i);
+        for (int i = mContentPanel.getChildCount() - 1; i >= 0; i--) {
+            InLineSettingPicker picker = (InLineSettingPicker) mContentPanel.getChildAt(i);
             ListPreference pref = group.findPreference(picker.getKey());
             if (pref != null) {
                 picker.setSettingChangedListener(this);
                 picker.initialize(pref);
             } else {  // remove the row if the preference is not supported
-                removeViewAt(i);
+                mContentPanel.removeViewAt(i);
             }
        }
        requestLayout();