SnapdragonCamera: Add SettingsManager, scene, and filter

Add SettingsManager to work as a database for settings.
It will handle all dependencies and populate the values.
Add scene mode and filter.
Restructure UI and menu by combining them and leave the
handling of settings to SettingsManager

Change-Id: I185163fdddbffd29434e6a9c41b33be6d3388f88
CRs-Fixed: 1018118

1 files changed, 1 insertions, 31 deletions

diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 1f9c8d921..e6e00ad56 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -37,7 +37,6 @@ import android.view.ViewGroup;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.Scroller;
 
-import com.android.camera.CaptureMenu;
 import com.android.camera.PhotoMenu;
 import com.android.camera.VideoMenu;
 import com.android.camera.PreviewGestures;
@@ -1832,7 +1831,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
             return true;
         PhotoMenu pMenu = mPreviewGestures.getPhotoMenu();
         VideoMenu vMenu = mPreviewGestures.getVideoMenu();
-        CaptureMenu cMenu = mPreviewGestures.getCaptureMenu();
+
         if (pMenu != null) {
             if (pMenu.isMenuBeingShown()) {
                 if (pMenu.isMenuBeingAnimated()) {
@@ -1850,23 +1849,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
                 }
             }
         }
-        if (cMenu != null) {
-            if (cMenu.isMenuBeingShown()) {
-                if (cMenu.isMenuBeingAnimated()) {
-                    if (cMenu.isOverMenu(ev)) {
-                        mSendToMenu = true;
-                        return true;
-                    }
-                }
-            }
 
-            if (cMenu.isPreviewMenuBeingShown()) {
-                if (cMenu.isOverPreviewMenu(ev)) {
-                    mSendToPreviewMenu = true;
-                    return true;
-                }
-            }
-        }
         if (vMenu != null) {
             if (vMenu.isMenuBeingShown()) {
                 if (vMenu.isMenuBeingAnimated()) {
@@ -1903,7 +1886,6 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
         }
         PhotoMenu pMenu = mPreviewGestures.getPhotoMenu();
         VideoMenu vMenu = mPreviewGestures.getVideoMenu();
-        CaptureMenu cMenu = mPreviewGestures.getCaptureMenu();
         if (pMenu != null) {
             if (mSendToPreviewMenu)
                 return pMenu.sendTouchToPreviewMenu(ev);
@@ -1917,19 +1899,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
                 return pMenu.sendTouchToPreviewMenu(ev);
             }
         }
-        if (cMenu != null) {
-            if (mSendToPreviewMenu)
-                return cMenu.sendTouchToPreviewMenu(ev);
-            if (mSendToMenu)
-                return cMenu.sendTouchToMenu(ev);
-            if (cMenu.isMenuBeingShown()) {
-                return cMenu.sendTouchToMenu(ev);
-            }
 
-            if (cMenu.isPreviewMenuBeingShown()) {
-                return cMenu.sendTouchToPreviewMenu(ev);
-            }
-        }
         if (vMenu != null) {
             if (mSendToPreviewMenu)
                 return vMenu.sendTouchToPreviewMenu(ev);