diff options
author | Sai Kumar Sanagavarapu <ssanagav@codeaurora.org> | 2015-07-15 12:58:58 +0530 |
---|---|---|
committer | Sai Kumar Sanagavarapu <ssanagav@codeaurora.org> | 2015-07-15 13:33:58 +0530 |
commit | 5655169cd7698f0a4a382520ca787703d3c5712e (patch) | |
tree | c6ef14229426e5e290eb747ccf6631bcac633e94 /src/com/android/camera/crop | |
parent | c28dbaf74ea7627cbea47537049b972dde6bdc4a (diff) | |
download | android_packages_apps_Snap-5655169cd7698f0a4a382520ca787703d3c5712e.tar.gz android_packages_apps_Snap-5655169cd7698f0a4a382520ca787703d3c5712e.tar.bz2 android_packages_apps_Snap-5655169cd7698f0a4a382520ca787703d3c5712e.zip |
SnapdragonCamera: Fix compilation
1. Address compilation due to compiler upgrade.
2. Comment out video dependencies to enable camera.
3. Fix compilation issue due to IMountService interface change.
4. Comment out ExtendedFace.
5. Remove non-standard video resolutions.
6. Revert "camera: override shutter sound volume" commit
8a50cda8f72738e943904fdf7cae189b2b0a8ea8.
Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a
Diffstat (limited to 'src/com/android/camera/crop')
-rw-r--r-- | src/com/android/camera/crop/CropActivity.java | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/com/android/camera/crop/CropActivity.java b/src/com/android/camera/crop/CropActivity.java index 9c9295dc4..9c09b9a87 100644 --- a/src/com/android/camera/crop/CropActivity.java +++ b/src/com/android/camera/crop/CropActivity.java @@ -118,8 +118,6 @@ public class CropActivity extends Activity { if (intent.getData() != null) { mSourceUri = intent.getData(); startLoadBitmap(mSourceUri); - } else { - pickImage(); } } @@ -144,18 +142,6 @@ public class CropActivity extends Activity { } /** - * Opens a selector in Gallery to chose an image for use when none was given - * in the CROP intent. - */ - private void pickImage() { - Intent intent = new Intent(); - intent.setType("image/*"); - intent.setAction(Intent.ACTION_GET_CONTENT); - startActivityForResult(Intent.createChooser(intent, getString(R.string.select_image)), - SELECT_PICTURE); - } - - /** * Callback for pickImage(). */ @Override |