Camera : Enable camera and camcorder UI features..

Added keys and APIs for enabling QC features from UI.

(cherry picked from commit a0fdd6924374635711ea6a554f3a59a087cf4b21)

Change-Id: Id50b7cebe2d33eaf7bb6a8e51fecded50ac6dcf8

Conflicts:
	src/com/android/camera/CameraSettings.java
	src/com/android/camera/PhotoMenu.java
	src/com/android/camera/PhotoModule.java
	src/com/android/camera/VideoModule.java

Conflicts:
	src/com/android/camera/CameraSettings.java
	src/com/android/camera/VideoModule.java
(cherry picked from commit 93cd1cdb59449ccb2b9594c9d8e3978a25d7f376)
(cherry picked from commit af04f9d621183addee0f7cdd7c1a41c8d0e65cfe)

1 files changed, 57 insertions, 27 deletions

diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 8db219924..afe8d312e 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -36,7 +36,11 @@ public class VideoMenu extends PieController
     private static String TAG = "CAM_VideoMenu";
 
     private VideoUI mUI;
-    private String[] mOtherKeys;
+    private String[] mOtherKeys1;
+    private String[] mOtherKeys2;
+    private MoreSettingPopup mPopup1;
+    private MoreSettingPopup mPopup2;
+
     private AbstractSettingPopup mPopup;
 
     private static final int POPUP_NONE = 0;
@@ -51,19 +55,15 @@ public class VideoMenu extends PieController
         mActivity = activity;
     }
 
-
     public void initialize(PreferenceGroup group) {
         super.initialize(group);
         mPopup = null;
+        mPopup1 = null;
+        mPopup2 = null;
         mPopupStatus = POPUP_NONE;
         PieItem item = null;
-        // white balance
-        if (group.findPreference(CameraSettings.KEY_WHITE_BALANCE) != null) {
-            item = makeItem(CameraSettings.KEY_WHITE_BALANCE);
-            mRenderer.addItem(item);
-        }
         // settings popup
-        mOtherKeys = new String[] {
+        mOtherKeys1 = new String[] {
                 CameraSettings.KEY_VIDEO_EFFECT,
                 CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL,
                 CameraSettings.KEY_VIDEO_QUALITY,
@@ -72,19 +72,44 @@ public class VideoMenu extends PieController
                 CameraSettings.KEY_VIDEO_DURATION,
                 CameraSettings.KEY_RECORD_LOCATION
         };
-        item = makeItem(R.drawable.ic_settings_holo_light);
-        item.setLabel(mActivity.getResources().getString(R.string.camera_menu_settings_label));
-        item.setOnClickListener(new OnClickListener() {
+
+       //settings popup
+       mOtherKeys2 = new String[] {
+                CameraSettings.KEY_COLOR_EFFECT,
+                CameraSettings.KEY_POWER_MODE,
+                CameraSettings.KEY_WHITE_BALANCE,
+                CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE,
+                CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE,
+       };
+
+        PieItem item1 = makeItem(R.drawable.ic_settings_holo_light);
+        item1.setLabel(mActivity.getResources().getString(R.string.camera_menu_more_label));
+        item1.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(PieItem item) {
+                if (mPopup1 == null || mPopupStatus != POPUP_FIRST_LEVEL) {
+                    initializePopup();
+                    mPopupStatus = POPUP_FIRST_LEVEL;
+                }
+                mUI.showPopup(mPopup1);
+            }
+        });
+        mRenderer.addItem(item1);
+
+        PieItem item2 = makeItem(R.drawable.ic_settings_holo_light);
+        item2.setLabel(mActivity.getResources().getString(R.string.camera_menu_more_label));
+        item2.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(PieItem item) {
-                if (mPopup == null || mPopupStatus != POPUP_FIRST_LEVEL) {
+                if (mPopup2 == null || mPopupStatus != POPUP_FIRST_LEVEL) {
                     initializePopup();
                     mPopupStatus = POPUP_FIRST_LEVEL;
                 }
-                mUI.showPopup(mPopup);
+                mUI.showPopup(mPopup2);
             }
         });
-        mRenderer.addItem(item);
+        mRenderer.addItem(item2);
+
         // camera switcher
         if (group.findPreference(CameraSettings.KEY_CAMERA_ID) != null) {
             item = makeItem(R.drawable.ic_switch_back);
@@ -117,18 +142,16 @@ public class VideoMenu extends PieController
             });
             mRenderer.addItem(item);
         }
-        // flash
-        if (group.findPreference(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE) != null) {
-            item = makeItem(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE);
-            mRenderer.addItem(item);
-        }
     }
 
     @Override
     public void reloadPreferences() {
         super.reloadPreferences();
-        if (mPopup != null) {
-            mPopup.reloadPreference();
+        if (mPopup1 != null) {
+            mPopup1.reloadPreference();
+        }
+        if (mPopup2 != null) {
+            mPopup2.reloadPreference();
         }
     }
 
@@ -145,7 +168,7 @@ public class VideoMenu extends PieController
     @Override
     // Hit when an item in the second-level popup gets selected
     public void onListPrefChanged(ListPreference pref) {
-        if (mPopup != null) {
+        if (mPopup1 != null && mPopup2 != null) {
             if (mPopupStatus == POPUP_SECOND_LEVEL) {
                 mUI.dismissPopup(true);
             }
@@ -157,15 +180,21 @@ public class VideoMenu extends PieController
         LayoutInflater inflater = (LayoutInflater) mActivity.getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);
 
-        MoreSettingPopup popup = (MoreSettingPopup) inflater.inflate(
+        MoreSettingPopup popup1 = (MoreSettingPopup) inflater.inflate(
                 R.layout.more_setting_popup, null, false);
-        popup.setSettingChangedListener(this);
-        popup.initialize(mPreferenceGroup, mOtherKeys);
+        popup1.setSettingChangedListener(this);
+        popup1.initialize(mPreferenceGroup, mOtherKeys1);
         if (mActivity.isSecureCamera()) {
             // Prevent location preference from getting changed in secure camera mode
-            popup.setPreferenceEnabled(CameraSettings.KEY_RECORD_LOCATION, false);
+            popup1.setPreferenceEnabled(CameraSettings.KEY_RECORD_LOCATION, false);
         }
-        mPopup = popup;
+        mPopup1 = popup1;
+
+        MoreSettingPopup popup2 = (MoreSettingPopup) inflater.inflate(
+                R.layout.more_setting_popup, null, false);
+        popup2.setSettingChangedListener(this);
+        popup2.initialize(mPreferenceGroup, mOtherKeys2);
+        mPopup2 = popup2;
     }
 
     public void popupDismissed(boolean topPopupOnly) {
@@ -204,4 +233,5 @@ public class VideoMenu extends PieController
         mUI.showPopup(mPopup);
         mPopupStatus = POPUP_SECOND_LEVEL;
     }
+
 }