From 039f1dc1fd89b5baeed8be05f3f21770cf75d4b3 Mon Sep 17 00:00:00 2001
From: Wu-cheng Li <wuchengli@google.com>
Date: Wed, 6 Jul 2011 16:38:58 +0800
Subject: Move zoom buttons and front/back camera switch to indicator wheel.

bug:5001059

Change-Id: I5ed60169b6f73dc41d84ba7bd299ed8bf394a284
---
 src/com/android/camera/ui/OtherSettingsPopup.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/com/android/camera/ui/OtherSettingsPopup.java')

diff --git a/src/com/android/camera/ui/OtherSettingsPopup.java b/src/com/android/camera/ui/OtherSettingsPopup.java
index 920d270..7e4bedb 100644
--- a/src/com/android/camera/ui/OtherSettingsPopup.java
+++ b/src/com/android/camera/ui/OtherSettingsPopup.java
@@ -16,14 +16,12 @@
 
 package com.android.camera.ui;
 
-import com.android.camera.CameraSettings;
 import com.android.camera.ListPreference;
 import com.android.camera.PreferenceGroup;
 import com.android.camera.R;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -48,12 +46,11 @@ public class OtherSettingsPopup extends AbstractSettingPopup
 
     private Context mContext;
     private Listener mListener;
-    private PreferenceGroup mPreferenceGroup;
     private ArrayList<HashMap<String, Object>> mListItem =
             new ArrayList<HashMap<String, Object>>();
 
     static public interface Listener {
-        public void onOtherSettingChanged();
+        public void onSettingChanged();
         public void onRestorePreferencesClicked();
     }
 
@@ -104,7 +101,6 @@ public class OtherSettingsPopup extends AbstractSettingPopup
     }
 
     public void initialize(PreferenceGroup group, String[] keys) {
-        mPreferenceGroup = group;
         // Prepare the setting items.
         for (int i = 0; i < keys.length; ++i) {
             HashMap<String, Object> map = new HashMap<String, Object>();
@@ -132,9 +128,10 @@ public class OtherSettingsPopup extends AbstractSettingPopup
         ((ListView) mSettingList).setSelector(android.R.color.transparent);
     }
 
+    @Override
     public void onSettingChanged() {
         if (mListener != null) {
-            mListener.onOtherSettingChanged();
+            mListener.onSettingChanged();
         }
     }
 
-- 
cgit v1.1