Use default volume control stream instead of the music stream.

Since the Camera API is moving back to using the system audio stream,
do not override the camera app volume control stream any more.

Bug: 5778365
Change-Id: I27a6a1769d39cb0b246bce7d721d846f6c1430d1
merge in ics-mr1-release history after reset to ics-mr1
Allow saving panorama after the activity is paused. (do not merge)

bug: 5541182
Change-Id: I42237d8dd4f8c39ddc2041ae32b886328a9c45c0
Do not allow switching to other activities during panorama capture. (do not merge)

bug:5541182
Change-Id: I1cdbba9a8aec3b5c832f6e58baa26ff6312cf59a
Merge "Do not allow switching to other activities during panorama capture. (do not merge)" into ics-mr1
merge in ics-mr1-release history after reset to ics-mr1
Import translations. DO NOT MERGE

Change-Id: I0719643bd6d66a3990dbfd2b6eb9e2fc64ab307e
merge in ics-mr1-release history after reset to ics-mr1
Fix the share popup. DO NOT MERGE

Fix the share popup to comply with the new design:
1. Black background.
2. Image is centered.
3. Share popup won't rotate automatically.

bug:6031042
Change-Id: I86b15a19bc8f7598d444cd9032960ea02e251668
merge in ics-mr1-release history after reset to ics-mr1
Camera: Fix issue with preview callback buffer size mismatch.

If android.hardware.Camera.PreviewCallback  is implemented in
the application layer, then the callback buffers will be delivered
to the application. A crash was seen in switching between picture
sizes with different aspect ratios.When aspect ratio changed the
preview was restarted after some delay. This was causing intermediate
buffers size to not match with the newly selected size.
Fixed this by calling stopPreview immediately after the aspect
ratio changed. Start preview will be called at a later point.

CRs-Fixed: 327767

Change-Id: I5f5a5f2a29e90e5484f98204a49400b1d96a800e
(cherry picked from commit ef175f83d4b225a0af8544c83dc727baa67d5940)
Camera-app: Fix touch AF in ZSL mode

- remove check for ZSL mode in autofocus
- change reset touch delay

CRs-Fixed: 336911
(cherry picked from commit 3def1f39506f30961d57fa5387a6935202c4e00a)

Change-Id: I4df524e32c868d15bb5fdde1ff392b6224bf2545
Camera: Fix scene mode entry AUTO in UI

CRs-Fixed: 342962
(cherry picked from commit 6e9ed3554e722ce498a2b2ce4c16ca96ae93258b)

Change-Id: I887523c17dd86c0a19bcf4093bf75cc25a35bcb5
Merge "Camera-app: Fix touch AF in ZSL mode" into ics_chocolate
Camera: Disable audio and zooming in HFR mode

Change-Id: I78bc0254bf81b38dc4ef7864153c16749ce18406
CRs-fixed: 341294 341281
Camera: Fix to avoid focus in zsl mode.

Change-Id: I040069602f50c2cfd9e6a438deba9e97d952fcbb
Camera: fixing the issue of disabled touch AEC and focus mode menu items

Change-Id: Id746ea95bdd1c29e3b9f255700a27b129b49be79
Merge "Camera: fixing the issue of disabled touch AEC and focus mode menu items" into ics_chocolate
Camera: Changes to set default values for video picture size

- Default video snapshot size is required and set it as 1080p
  for both front and back camera.

Change-Id: Ib86b25ab28f02ae1706ea5deb78b66ea744a7252
CRs-Fixed: 345705
Merge commit 'android-4.0.4_r1.1' into merge_branch

* commit 'android-4.0.4_r1.1':
  Fix the share popup. DO NOT MERGE
  Import translations. DO NOT MERGE
  Do not allow switching to other activities during panorama capture. (do not merge)
  Allow saving panorama after the activity is paused. (do not merge)
  Use default volume control stream instead of the music stream.

Conflicts:
	AndroidManifest.xml

Change-Id: I2310de727c82f309d67793dfd9496f7ca035bdb8