diff options
| author | Senpo Hu <senpo@google.com> | 2015-02-10 18:28:17 -0800 |
|---|---|---|
| committer | Senpo Hu <senpo@google.com> | 2015-02-17 11:10:03 -0800 |
| commit | b6c4a314d0a0a185e6d987298ef9b7f4db8a6a2f (patch) | |
| tree | 75cac939ce9451430fc2f9487c53fa49ce10383b /src/com/android/camera/widget | |
| parent | 401990916915791be14c65694ce3507eac3ec82d (diff) | |
| download | android_packages_apps_Camera2-b6c4a314d0a0a185e6d987298ef9b7f4db8a6a2f.tar.gz android_packages_apps_Camera2-b6c4a314d0a0a185e6d987298ef9b7f4db8a6a2f.tar.bz2 android_packages_apps_Camera2-b6c4a314d0a0a185e6d987298ef9b7f4db8a6a2f.zip | |
Enable exposure compensation in CaptureModule.
* Expose camera exposure compensation capabilities in OneCameraCharacteristics.
* Turn off exposure compensation on Nexus 6 (API level 21).
Bug: 18523154
Change-Id: I551f19945f5a64a09a76b3a0777664d16a9b2ba2
Diffstat (limited to 'src/com/android/camera/widget')
| -rw-r--r-- | src/com/android/camera/widget/ModeOptions.java | 14 | ||||
| -rw-r--r-- | src/com/android/camera/widget/ModeOptionsOverlay.java | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/com/android/camera/widget/ModeOptions.java b/src/com/android/camera/widget/ModeOptions.java index 647de6bb7..ee863cb2c 100644 --- a/src/com/android/camera/widget/ModeOptions.java +++ b/src/com/android/camera/widget/ModeOptions.java @@ -125,16 +125,12 @@ public class ModeOptions extends FrameLayout { mModeOptionsPano = (RadioOptions) findViewById(R.id.mode_options_pano); mModeOptionsExposure = (RadioOptions) findViewById(R.id.mode_options_exposure); mMainBar = mActiveBar = mModeOptionsButtons; + } - ImageButton exposureButton = (ImageButton) findViewById(R.id.exposure_button); - exposureButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - mActiveBar = mModeOptionsExposure; - mMainBar.setVisibility(View.INVISIBLE); - mActiveBar.setVisibility(View.VISIBLE); - } - }); + public void showExposureOptions() { + mActiveBar = mModeOptionsExposure; + mMainBar.setVisibility(View.INVISIBLE); + mActiveBar.setVisibility(View.VISIBLE); } public void setMainBar(int b) { diff --git a/src/com/android/camera/widget/ModeOptionsOverlay.java b/src/com/android/camera/widget/ModeOptionsOverlay.java index c38360d43..21ef493fa 100644 --- a/src/com/android/camera/widget/ModeOptionsOverlay.java +++ b/src/com/android/camera/widget/ModeOptionsOverlay.java @@ -86,6 +86,10 @@ public class ModeOptionsOverlay extends FrameLayout mModeOptionsToggle.setClickable(clickable); } + public void showExposureOptions() { + mModeOptions.showExposureOptions(); + } + /** * Sets the mode options listener. * |