diff options
| author | Erin Dahlgren <edahlgren@google.com> | 2014-03-04 17:08:37 -0800 |
|---|---|---|
| committer | Erin Dahlgren <edahlgren@google.com> | 2014-03-04 17:08:37 -0800 |
| commit | 8c1f97010898020ef7776a91aa1e437ce621fedb (patch) | |
| tree | 3b382a4847d6bb7750e00d0d0be9f9035454fd4b /src | |
| parent | 1ba90e3ea4b8280c28cf6d87e5b4cc6b3b5f1645 (diff) | |
| download | android_packages_apps_Camera2-8c1f97010898020ef7776a91aa1e437ce621fedb.tar.gz android_packages_apps_Camera2-8c1f97010898020ef7776a91aa1e437ce621fedb.tar.bz2 android_packages_apps_Camera2-8c1f97010898020ef7776a91aa1e437ce621fedb.zip | |
Only allow simple capture for image intents.
Bug: 13289606
Change-Id: Id753def11f6499940a284b6bc3d33f5e45363183
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/app/CameraAppUI.java | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 444da0151..71d4eaea5 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1205,10 +1205,6 @@ public class CameraActivity extends Activity || MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.equals(getIntent() .getAction())) { modeIndex = photoIndex; - if (mSettingsManager.getInt(SettingsManager.SETTING_STARTUP_MODULE_INDEX) - == gcamIndex && GcamHelper.hasGcamCapture()) { - modeIndex = gcamIndex; - } } else if (MediaStore.ACTION_IMAGE_CAPTURE.equals(getIntent().getAction()) || MediaStore.ACTION_IMAGE_CAPTURE_SECURE.equals(getIntent().getAction())) { modeIndex = photoIndex; diff --git a/src/com/android/camera/app/CameraAppUI.java b/src/com/android/camera/app/CameraAppUI.java index 6b202ba8d..673fb8ed5 100644 --- a/src/com/android/camera/app/CameraAppUI.java +++ b/src/com/android/camera/app/CameraAppUI.java @@ -1489,7 +1489,7 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener, } } - if (bottomBarSpec.hideHdr) { + if (bottomBarSpec.hideHdr || mIsCaptureIntent) { // Force hide hdr or hdr plus icon. buttonManager.hideButton(ButtonManager.BUTTON_HDRPLUS); } else { |