Change video effect setting to a grid view.

bug:5226051

Change-Id: If3c6aece533a263411f55d21a9cc76282b021554

2 files changed, 17 insertions, 9 deletions

diff --git a/src/com/android/camera/ui/BasicSettingPopup.java b/src/com/android/camera/ui/BasicSettingPopup.java
index aca88ca..9220c3b 100644
--- a/src/com/android/camera/ui/BasicSettingPopup.java
+++ b/src/com/android/camera/ui/BasicSettingPopup.java
@@ -23,8 +23,8 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
+import android.widget.AbsListView;
 import android.widget.AdapterView;
-import android.widget.ListView;
 import android.widget.SimpleAdapter;
 
 import java.util.ArrayList;
@@ -47,7 +47,7 @@ public class BasicSettingPopup extends AbstractSettingPopup implements
         super(context, attrs);
     }
 
-    public void initialize(IconListPreference preference) {
+    public void initialize(IconListPreference preference, int settingItemLayoutId) {
         mPreference = preference;
         Context context = getContext();
         CharSequence[] entries = mPreference.getEntries();
@@ -69,11 +69,11 @@ public class BasicSettingPopup extends AbstractSettingPopup implements
             listItem.add(map);
         }
         SimpleAdapter listItemAdapter = new SimpleAdapter(context, listItem,
-                R.layout.setting_item,
+                settingItemLayoutId,
                 new String[] {"text", "image"},
                 new int[] {R.id.text, R.id.image});
-        ((ListView) mSettingList).setAdapter(listItemAdapter);
-        ((ListView) mSettingList).setOnItemClickListener(this);
+        ((AbsListView) mSettingList).setAdapter(listItemAdapter);
+        ((AbsListView) mSettingList).setOnItemClickListener(this);
         reloadPreference();
     }
 
@@ -82,7 +82,7 @@ public class BasicSettingPopup extends AbstractSettingPopup implements
     public void reloadPreference() {
         int index = mPreference.findIndexOfValue(mPreference.getValue());
         if (index != -1) {
-            ((ListView) mSettingList).setItemChecked(index, true);
+            ((AbsListView) mSettingList).setItemChecked(index, true);
         } else {
             Log.e(TAG, "Invalid preference value.");
             mPreference.print();
diff --git a/src/com/android/camera/ui/IndicatorButton.java b/src/com/android/camera/ui/IndicatorButton.java
index 880a650..7948f7c 100644
--- a/src/com/android/camera/ui/IndicatorButton.java
+++ b/src/com/android/camera/ui/IndicatorButton.java
@@ -16,6 +16,7 @@
 
 package com.android.camera.ui;
 
+import com.android.camera.CameraSettings;
 import com.android.camera.IconListPreference;
 import com.android.camera.R;
 
@@ -102,10 +103,17 @@ public class IndicatorButton extends AbstractIndicatorButton implements BasicSet
                 Context.LAYOUT_INFLATER_SERVICE);
         ViewGroup root = (ViewGroup) getRootView().findViewById(R.id.frame_layout);
 
-        BasicSettingPopup popup = (BasicSettingPopup) inflater.inflate(
-                R.layout.basic_setting_popup, root, false);
+        BasicSettingPopup popup;
+        if (CameraSettings.KEY_VIDEO_EFFECT.equals(getKey())) {
+            popup = (BasicSettingPopup) inflater.inflate(
+                    R.layout.effect_setting_popup, root, false);
+            popup.initialize(mPreference, R.layout.effect_setting_item);
+        } else {
+            popup = (BasicSettingPopup) inflater.inflate(
+                    R.layout.basic_setting_popup, root, false);
+            popup.initialize(mPreference, R.layout.setting_item);
+        }
         popup.setSettingChangedListener(this);
-        popup.initialize(mPreference);
         root.addView(popup);
         mPopup = popup;
     }