Camera: Fix for stretched preview in camera and camcorder...

Stretched preview is observed in front camera due to sensor's
mount angle. So resizing the preview by considering aspect ratio
of the preview.

(cherry picked from commit Ie8a9e062782aa6caaa80ddab705c937da6b0761e)

Change-Id: I0bca9076a6dffa4c4972e6d5d0939c57569615bd

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

Conflicts:
	src/com/android/camera/PhotoMenu.java
	src/com/android/camera/PhotoModule.java
(cherry picked from commit 2960ef94825458dc07a497d4414155b57ae620d7)
(cherry picked from commit d2fbed622a486151a656261d0dd56c896f0cc700)

1 files changed, 21 insertions, 20 deletions

diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 5e230f451..4aeacb1f4 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -90,25 +90,6 @@ public class PhotoMenu extends PieController
             mRenderer.addItem(item);
         }
 
-        // countdown timer
-        final ListPreference ctpref = group.findPreference(CameraSettings.KEY_TIMER);
-        final ListPreference beeppref = group.findPreference(CameraSettings.KEY_TIMER_SOUND_EFFECTS);
-        item = makeItem(R.drawable.ic_timer);
-        item.setLabel(res.getString(R.string.pref_camera_timer_title).toUpperCase(locale));
-        item.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(PieItem item) {
-                CountdownTimerPopup timerPopup = (CountdownTimerPopup) mActivity.getLayoutInflater().inflate(
-                        R.layout.countdown_setting_popup, null, false);
-                timerPopup.initialize(ctpref, beeppref);
-                timerPopup.setSettingChangedListener(PhotoMenu.this);
-                mUI.dismissPopup();
-                mPopup = timerPopup;
-                mUI.showPopup(mPopup);
-            }
-        });
-        mRenderer.addItem(item);
-
         mOtherKeys1 = new String[] {
                 CameraSettings.KEY_SCENE_MODE,
                 CameraSettings.KEY_RECORD_LOCATION,
@@ -117,7 +98,9 @@ public class PhotoMenu extends PieController
                 CameraSettings.KEY_FOCUS_MODE,
                 CameraSettings.KEY_PICTURE_FORMAT,
                 CameraSettings.KEY_JPEG_QUALITY,
-                CameraSettings.KEY_ZSL
+                CameraSettings.KEY_ZSL,
+                CameraSettings.KEY_TIMER,
+                CameraSettings.KEY_TIMER_SOUND_EFFECTS
         };
 
         mOtherKeys2 = new String[] {
@@ -189,6 +172,24 @@ public class PhotoMenu extends PieController
         mRenderer.addItem(item3);
 
         // camera switcher
+        // Exposure compensation.
+        if (group.findPreference(CameraSettings.KEY_EXPOSURE) != null) {
+            item = makeItem(CameraSettings.KEY_EXPOSURE);
+            item.setLabel(res.getString(R.string.pref_exposure_label));
+            mRenderer.addItem(item);
+        }
+        // More settings.
+        PieItem more = makeItem(R.drawable.ic_settings_holo_light);
+        more.setLabel(res.getString(R.string.camera_menu_more_label));
+        mRenderer.addItem(more);
+
+        // Flash.
+        if (group.findPreference(CameraSettings.KEY_FLASH_MODE) != null) {
+            item = makeItem(CameraSettings.KEY_FLASH_MODE);
+            item.setLabel(res.getString(R.string.pref_camera_flashmode_label));
+            mRenderer.addItem(item);
+        }
+        // Camera switcher.
         if (group.findPreference(CameraSettings.KEY_CAMERA_ID) != null) {
             item = makeSwitchItem(CameraSettings.KEY_CAMERA_ID, false);
             final PieItem fitem = item;