+++ /dev/null
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/on_screen_indicators"
- android:layout_width="64dip"
- android:layout_height="64dip" >
-
- <ImageView
- android:id="@+id/menu_scenemode_indicator"
- style="@style/MenuIndicator"
- android:layout_gravity="left|top"
- android:src="@drawable/ic_indicator_sce_off" />
-
- <ImageView
- android:id="@+id/menu_timer_indicator"
- style="@style/MenuIndicator"
- android:layout_gravity="center_horizontal|top"
- android:src="@drawable/ic_indicator_timer_off" />
-
- <ImageView
- android:id="@+id/menu_flash_indicator"
- style="@style/MenuIndicator"
- android:layout_gravity="right|top"
- android:src="@drawable/ic_indicator_flash_off" />
-
- <ImageView
- android:id="@+id/menu_exposure_indicator"
- style="@style/MenuIndicator"
- android:layout_gravity="left|bottom"
- android:src="@drawable/ic_indicator_ev_0" />
-
- <ImageView
- android:id="@+id/menu_location_indicator"
- style="@style/MenuIndicator"
- android:layout_gravity="center_horizontal|bottom"
- android:src="@drawable/ic_indicator_loc_on" />
-
- <ImageView
- android:id="@+id/menu_wb_indicator"
- style="@style/MenuIndicator"
- android:layout_gravity="right|bottom"
- android:src="@drawable/ic_indicator_wb_off" />
-
-</FrameLayout>
+++ /dev/null
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/on_screen_indicators"
- android:layout_width="64dip"
- android:layout_height="64dip" >
-
- <ImageView
- android:id="@+id/menu_scenemode_indicator"
- style="@style/MenuIndicator"
- android:layout_gravity="left|top"
- android:src="@drawable/ic_indicator_sce_off" />
-
- <ImageView
- android:id="@+id/menu_timer_indicator"
- style="@style/MenuIndicator"
- android:layout_gravity="center_horizontal|top"
- android:src="@drawable/ic_indicator_timer_off" />
-
- <ImageView
- android:id="@+id/menu_flash_indicator"
- style="@style/MenuIndicator"
- android:layout_gravity="right|top"
- android:src="@drawable/ic_indicator_flash_off" />
-
- <ImageView
- android:id="@+id/menu_exposure_indicator"
- style="@style/MenuIndicator"
- android:layout_gravity="left|bottom"
- android:src="@drawable/ic_indicator_ev_0" />
-
- <ImageView
- android:id="@+id/menu_location_indicator"
- style="@style/MenuIndicator"
- android:layout_gravity="center_horizontal|bottom"
- android:src="@drawable/ic_indicator_loc_on" />
-
- <ImageView
- android:id="@+id/menu_wb_indicator"
- style="@style/MenuIndicator"
- android:layout_gravity="right|bottom"
- android:src="@drawable/ic_indicator_wb_off" />
-
-</FrameLayout>
<item>@drawable/ic_flash_off_indicator</item>
</array>
- <!-- Camera Preferences White Balance dialog box entries -->
- <string-array name="pref_camera_whitebalance_entries" translatable="false">
- <item>@string/pref_camera_whitebalance_entry_incandescent</item>
- <item>@string/pref_camera_whitebalance_entry_fluorescent</item>
- <item>@string/pref_camera_whitebalance_entry_auto</item>
- <item>@string/pref_camera_whitebalance_entry_daylight</item>
- <item>@string/pref_camera_whitebalance_entry_cloudy</item>
- </string-array>
-
- <string-array name="pref_camera_whitebalance_labels" translatable="false">
- <item>@string/pref_camera_whitebalance_label_incandescent</item>
- <item>@string/pref_camera_whitebalance_label_fluorescent</item>
- <item>@string/pref_camera_whitebalance_label_auto</item>
- <item>@string/pref_camera_whitebalance_label_daylight</item>
- <item>@string/pref_camera_whitebalance_label_cloudy</item>
- </string-array>
-
- <string-array name="pref_camera_whitebalance_entryvalues" translatable="false">
- <item>incandescent</item>
- <item>fluorescent</item>
- <item>auto</item>
- <item>daylight</item>
- <item>cloudy-daylight</item>
- </string-array>
-
- <array name="whitebalance_icons" translatable="false">
- <item>@drawable/ic_wb_incandescent</item>
- <item>@drawable/ic_wb_fluorescent</item>
- <item>@drawable/ic_wb_auto</item>
- <item>@drawable/ic_wb_sunlight</item>
- <item>@drawable/ic_wb_cloudy</item>
- </array>
-
- <array name="whitebalance_largeicons" translatable="false">
- <item>@drawable/ic_wb_incandescent</item>
- <item>@drawable/ic_wb_fluorescent</item>
- <item>@drawable/ic_wb_auto</item>
- <item>@drawable/ic_wb_sunlight</item>
- <item>@drawable/ic_wb_cloudy</item>
- </array>
-
- <array name="camera_wb_indicators" translatable="false">
- <item>@drawable/ic_indicator_wb_tungsten</item>
- <item>@drawable/ic_indicator_wb_fluorescent</item>
- <item>@drawable/ic_indicator_wb_off</item>
- <item>@drawable/ic_indicator_wb_daylight</item>
- <item>@drawable/ic_indicator_wb_cloudy</item>
- </array>
-
- <!-- Camera Preferences Scene Mode dialog box entries -->
- <string-array name="pref_camera_scenemode_entries" translatable="false">
- <item>@string/pref_camera_scenemode_entry_action</item>
- <item>@string/pref_camera_scenemode_entry_night</item>
- <item>@string/pref_camera_scenemode_entry_auto</item>
- <item>@string/pref_camera_scenemode_entry_sunset</item>
- <item>@string/pref_camera_scenemode_entry_party</item>
- </string-array>
-
- <string-array name="pref_camera_scenemode_labels">
- <item>@string/pref_camera_scenemode_label_action</item>
- <item>@string/pref_camera_scenemode_label_night</item>
- <item>@string/pref_camera_scenemode_label_auto</item>
- <item>@string/pref_camera_scenemode_label_sunset</item>
- <item>@string/pref_camera_scenemode_label_party</item>
- </string-array>
-
- <array name="pref_camera_scenemode_icons">
- <item>@drawable/ic_sce_action</item>
- <item>@drawable/ic_sce_night</item>
- <item>@drawable/ic_sce_off</item>
- <item>@drawable/ic_sce_sunset</item>
- <item>@drawable/ic_sce_party</item>
- </array>
-
<string-array name="pref_camera_scenemode_entryvalues" translatable="false">
- <item>action</item>
- <item>night</item>
<item>auto</item>
- <item>sunset</item>
- <item>party</item>
+ <item>hdr</item>
</string-array>
<array name="camera_id_entries" translatable="false">
button = getButtonOrError(BUTTON_CAMERA);
break;
}
- case SettingsManager.SETTING_CAMERA_HDR: {
+ case SettingsManager.SETTING_CAMERA_HDR_PLUS: {
index = mSettingsManager.getStringValueIndex(id);
button = getButtonOrError(BUTTON_HDRPLUS);
break;
}
+ case SettingsManager.SETTING_CAMERA_HDR: {
+ index = mSettingsManager.getStringValueIndex(id);
+ button = getButtonOrError(BUTTON_HDR);
+ break;
+ }
case SettingsManager.SETTING_CAMERA_GRID_LINES: {
index = mSettingsManager.getStringValueIndex(id);
button = getButtonOrError(BUTTON_GRID_LINES);
}
/**
- * Enable a known button by id, with a state change callback and
- * a resource id that points to an array of drawables.
+ * Initialize a known button by id, with a state change callback and
+ * a resource id that points to an array of drawables, and then enable
+ * the button.
*/
- public void enableButton(int buttonId, ButtonCallback cb) {
+ public void initializeButton(int buttonId, ButtonCallback cb) {
MultiToggleImageButton button = getButtonOrError(buttonId);
switch (buttonId) {
case BUTTON_FLASH:
- enableFlashButton(button, cb, R.array.camera_flashmode_icons);
+ initializeFlashButton(button, cb, R.array.camera_flashmode_icons);
break;
case BUTTON_TORCH:
- enableTorchButton(button, cb, R.array.video_flashmode_icons);
+ initializeTorchButton(button, cb, R.array.video_flashmode_icons);
break;
case BUTTON_CAMERA:
- enableCameraButton(button, cb, R.array.camera_id_icons);
+ initializeCameraButton(button, cb, R.array.camera_id_icons);
break;
case BUTTON_HDRPLUS:
- enableHdrPlusButton(button, cb, R.array.pref_camera_hdr_plus_icons);
+ initializeHdrPlusButton(button, cb, R.array.pref_camera_hdr_plus_icons);
break;
case BUTTON_HDR:
- enableHdrPlusButton(button, cb, R.array.pref_camera_hdr_icons);
+ initializeHdrButton(button, cb, R.array.pref_camera_hdr_icons);
break;
case BUTTON_GRID_LINES:
- enableGridLinesButton(button, cb, R.array.grid_lines_icons);
+ initializeGridLinesButton(button, cb, R.array.grid_lines_icons);
break;
case BUTTON_PANO_ORIENTATION:
- enablePanoOrientationButton(button, cb,
- PhotoSphereHelper.getPanoramaOrientationOptionArrayId());
+ initializePanoOrientationButton(button, cb,
+ PhotoSphereHelper.getPanoramaOrientationOptionArrayId());
break;
default:
throw new IllegalArgumentException("button not known by id=" + buttonId);
}
- if (!button.isEnabled()) {
- button.setEnabled(true);
- if (mListener != null) {
- mListener.onButtonEnabledChanged(this, buttonId);
- }
- }
- button.setTag(R.string.tag_enabled_id, (Integer) buttonId);
-
- if (button.getVisibility() != View.VISIBLE) {
- button.setVisibility(View.VISIBLE);
- if (mListener != null) {
- mListener.onButtonVisibilityChanged(this, buttonId);
- }
- }
+ enableButton(buttonId);
}
/**
- * Enable a known button with a click listener and a resource id.
+ * Initialize a known button with a click listener and a resource id.
* Sets the button visible.
*/
- public void enablePushButton(int buttonId, View.OnClickListener cb,
+ public void initializePushButton(int buttonId, View.OnClickListener cb,
int imageId) {
ImageButton button = getImageButtonOrError(buttonId);
button.setOnClickListener(cb);
}
/**
- * Enable a known button with a click listener. Sets the button visible.
+ * Initialize a known button with a click listener. Sets the button visible.
*/
- public void enablePushButton(int buttonId, View.OnClickListener cb) {
+ public void initializePushButton(int buttonId, View.OnClickListener cb) {
ImageButton button = getImageButtonOrError(buttonId);
button.setOnClickListener(cb);
}
/**
+ * Enables a button that has already been initialized.
+ */
+ public void enableButton(int buttonId) {
+ ImageButton button = getButtonOrError(buttonId);
+ if (!button.isEnabled()) {
+ button.setEnabled(true);
+ if (mListener != null) {
+ mListener.onButtonEnabledChanged(this, buttonId);
+ }
+ }
+ button.setTag(R.string.tag_enabled_id, buttonId);
+
+ if (button.getVisibility() != View.VISIBLE) {
+ button.setVisibility(View.VISIBLE);
+ if (mListener != null) {
+ mListener.onButtonVisibilityChanged(this, buttonId);
+ }
+ }
+ }
+
+ /**
* Hide a button by id.
*/
public void hideButton(int buttonId) {
}
/**
- * Enable a flash button.
+ * Initialize a flash button.
*/
- private void enableFlashButton(MultiToggleImageButton button,
+ private void initializeFlashButton(MultiToggleImageButton button,
final ButtonCallback cb, int resIdImages) {
if (resIdImages > 0) {
}
/**
- * Enable video torch button
+ * Initialize video torch button
*/
- private void enableTorchButton(MultiToggleImageButton button,
+ private void initializeTorchButton(MultiToggleImageButton button,
final ButtonCallback cb, int resIdImages) {
if (resIdImages > 0) {
}
/**
- * Enable a camera button.
+ * Initialize a camera button.
*/
- private void enableCameraButton(final MultiToggleImageButton button,
+ private void initializeCameraButton(final MultiToggleImageButton button,
final ButtonCallback cb, int resIdImages) {
if (resIdImages > 0) {
}
/**
- * Enable an hdr plus button.
+ * Initialize an hdr plus button.
*/
- private void enableHdrPlusButton(MultiToggleImageButton button,
+ private void initializeHdrPlusButton(MultiToggleImageButton button,
final ButtonCallback cb, int resIdImages) {
if (resIdImages > 0) {
}
button.overrideContentDescriptions(R.array.hdr_plus_descriptions);
+ int index = mSettingsManager.getStringValueIndex(SettingsManager.SETTING_CAMERA_HDR_PLUS);
+ button.setState(index >= 0 ? index : 0, false);
+
+ button.setOnStateChangeListener(new MultiToggleImageButton.OnStateChangeListener() {
+ @Override
+ public void stateChanged(View view, int state) {
+ mSettingsManager.setStringValueIndex(SettingsManager.SETTING_CAMERA_HDR_PLUS, state);
+ if (cb != null) {
+ cb.onStateChanged(state);
+ }
+ }
+ });
+ }
+
+ /**
+ * Initialize an hdr button.
+ */
+ private void initializeHdrButton(MultiToggleImageButton button,
+ final ButtonCallback cb, int resIdImages) {
+
+ if (resIdImages > 0) {
+ button.overrideImageIds(resIdImages);
+ }
+ button.overrideContentDescriptions(R.array.hdr_descriptions);
+
int index = mSettingsManager.getStringValueIndex(SettingsManager.SETTING_CAMERA_HDR);
button.setState(index >= 0 ? index : 0, false);
+ updateFlashButton();
button.setOnStateChangeListener(new MultiToggleImageButton.OnStateChangeListener() {
@Override
mSettingsManager.setStringValueIndex(SettingsManager.SETTING_CAMERA_HDR, state);
if (cb != null) {
cb.onStateChanged(state);
+ updateFlashButton();
}
}
});
}
- /**
- * Enable a grid lines button.
+
+ /**
+ * Flash button will be disabled (i.e. greyed out) when HDR is on.
+ */
+ private void updateFlashButton() {
+ if (mSettingsManager.isHdrOn()) {
+ disableButton(BUTTON_FLASH);
+ } else {
+ enableButton(BUTTON_FLASH);
+ }
+ }
+
+
+ /**
+ * Initialize a grid lines button.
*/
- private void enableGridLinesButton(MultiToggleImageButton button,
+ private void initializeGridLinesButton(MultiToggleImageButton button,
final ButtonCallback cb, int resIdImages) {
if (resIdImages > 0) {
}
/**
- * Enable a panorama orientation button.
+ * Initialize a panorama orientation button.
*/
- private void enablePanoOrientationButton(MultiToggleImageButton button,
+ private void initializePanoOrientationButton(MultiToggleImageButton button,
final ButtonCallback cb, int resIdImages) {
if (resIdImages > 0) {
+++ /dev/null
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.camera;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.hardware.Camera;
-import android.hardware.Camera.Parameters;
-import android.view.View;
-import android.widget.ImageView;
-
-import com.android.camera2.R;
-
-/**
- * The on-screen indicators of the pie menu button. They show the camera
- * settings in the viewfinder.
- */
-public class OnScreenIndicators {
- public static final String SCENE_MODE_HDR_PLUS = "hdr_plus";
-
- private final int[] mWBArray;
- private final View mOnScreenIndicators;
- private final ImageView mExposureIndicator;
- private final ImageView mFlashIndicator;
- private final ImageView mSceneIndicator;
- private final ImageView mLocationIndicator;
- private final ImageView mTimerIndicator;
- private final ImageView mWBIndicator;
-
- public OnScreenIndicators(Context ctx, View onScreenIndicatorsView) {
- TypedArray iconIds = ctx.getResources().obtainTypedArray(
- R.array.camera_wb_indicators);
- final int n = iconIds.length();
- mWBArray = new int[n];
- for (int i = 0; i < n; i++) {
- mWBArray[i] = iconIds.getResourceId(i, R.drawable.ic_indicator_wb_off);
- }
- mOnScreenIndicators = onScreenIndicatorsView;
- mExposureIndicator = (ImageView) onScreenIndicatorsView.findViewById(
- R.id.menu_exposure_indicator);
- mFlashIndicator = (ImageView) onScreenIndicatorsView.findViewById(
- R.id.menu_flash_indicator);
- mSceneIndicator = (ImageView) onScreenIndicatorsView.findViewById(
- R.id.menu_scenemode_indicator);
- mLocationIndicator = (ImageView) onScreenIndicatorsView.findViewById(
- R.id.menu_location_indicator);
- mTimerIndicator = (ImageView) onScreenIndicatorsView.findViewById(
- R.id.menu_timer_indicator);
- mWBIndicator = (ImageView) onScreenIndicatorsView.findViewById(
- R.id.menu_wb_indicator);
- }
-
- /**
- * Resets all indicators to show the default values.
- */
- public void resetToDefault() {
- updateExposureOnScreenIndicator(0);
- updateFlashOnScreenIndicator(Parameters.FLASH_MODE_OFF);
- updateSceneOnScreenIndicator(Parameters.SCENE_MODE_AUTO);
- updateWBIndicator(2);
- updateTimerIndicator(false);
- updateLocationIndicator(false);
- }
-
- /**
- * Sets the exposure indicator using exposure compensations step rounding.
- */
- public void updateExposureOnScreenIndicator(Camera.Parameters params, int value) {
- if (mExposureIndicator == null) {
- return;
- }
- float step = params.getExposureCompensationStep();
- value = Math.round(value * step);
- updateExposureOnScreenIndicator(value);
- }
-
- /**
- * Set the exposure indicator to the given value.
- *
- * @param value Value between -3 and 3. If outside this range, 0 is used by
- * default.
- */
- public void updateExposureOnScreenIndicator(int value) {
- int id = 0;
- switch(value) {
- case -3:
- id = R.drawable.ic_indicator_ev_n3;
- break;
- case -2:
- id = R.drawable.ic_indicator_ev_n2;
- break;
- case -1:
- id = R.drawable.ic_indicator_ev_n1;
- break;
- case 0:
- id = R.drawable.ic_indicator_ev_0;
- break;
- case 1:
- id = R.drawable.ic_indicator_ev_p1;
- break;
- case 2:
- id = R.drawable.ic_indicator_ev_p2;
- break;
- case 3:
- id = R.drawable.ic_indicator_ev_p3;
- break;
- }
- mExposureIndicator.setImageResource(id);
- }
-
- public void updateWBIndicator(int wbIndex) {
- if (mWBIndicator == null) return;
- mWBIndicator.setImageResource(mWBArray[wbIndex]);
- }
-
- public void updateTimerIndicator(boolean on) {
- if (mTimerIndicator == null) return;
- mTimerIndicator.setImageResource(on ? R.drawable.ic_indicator_timer_on
- : R.drawable.ic_indicator_timer_off);
- }
-
- public void updateLocationIndicator(boolean on) {
- if (mLocationIndicator == null) return;
- mLocationIndicator.setImageResource(on ? R.drawable.ic_indicator_loc_on
- : R.drawable.ic_indicator_loc_off);
- }
-
- /**
- * Set the flash indicator to the given value.
- *
- * @param value One of Parameters.FLASH_MODE_OFF,
- * Parameters.FLASH_MODE_AUTO, Parameters.FLASH_MODE_ON.
- */
- public void updateFlashOnScreenIndicator(String value) {
- if (mFlashIndicator == null) {
- return;
- }
- if (value == null || Parameters.FLASH_MODE_OFF.equals(value)) {
- mFlashIndicator.setImageResource(R.drawable.ic_indicator_flash_off);
- } else {
- if (Parameters.FLASH_MODE_AUTO.equals(value)) {
- mFlashIndicator.setImageResource(R.drawable.ic_indicator_flash_auto);
- } else if (Parameters.FLASH_MODE_ON.equals(value)
- || Parameters.FLASH_MODE_TORCH.equals(value)) {
- mFlashIndicator.setImageResource(R.drawable.ic_indicator_flash_on);
- } else {
- mFlashIndicator.setImageResource(R.drawable.ic_indicator_flash_off);
- }
- }
- }
-
- /**
- * Set the scene indicator depending on the given scene mode.
- *
- * @param value the current Parameters.SCENE_MODE_* value or
- * {@link #SCENE_MODE_HDR_PLUS}.
- */
- public void updateSceneOnScreenIndicator(String value) {
- if (mSceneIndicator == null) {
- return;
- }
-
- if (SCENE_MODE_HDR_PLUS.equals(value)) {
- mSceneIndicator.setImageResource(R.drawable.ic_indicator_hdr_plus_on);
- } else if ((value == null) || Parameters.SCENE_MODE_AUTO.equals(value)) {
- mSceneIndicator.setImageResource(R.drawable.ic_indicator_sce_off);
- } else if (Parameters.SCENE_MODE_HDR.equals(value)) {
- mSceneIndicator.setImageResource(R.drawable.ic_indicator_sce_hdr);
- } else {
- mSceneIndicator.setImageResource(R.drawable.ic_indicator_sce_on);
- }
- }
-
- /**
- * Sets the visibility of all indicators.
- *
- * @param visibility View.VISIBLE, View.GONE etc.
- */
- public void setVisibility(int visibility) {
- mOnScreenIndicators.setVisibility(visibility);
- }
-}
private void switchToGcamCapture() {
if (mActivity != null && mGcamModeIndex != 0) {
SettingsManager settingsManager = mActivity.getSettingsManager();
- settingsManager.set(SettingsManager.SETTING_CAMERA_HDR,
+ settingsManager.set(SettingsManager.SETTING_CAMERA_HDR_PLUS,
SettingsManager.VALUE_ON);
// Disable the HDR+ button to prevent callbacks from being
new ButtonManager.ButtonCallback() {
@Override
public void onStateChanged(int state) {
+ SettingsManager settingsManager = mActivity.getSettingsManager();
if (GcamHelper.hasGcamCapture()) {
// Set the camera setting to default backfacing.
- SettingsManager settingsManager = mActivity.getSettingsManager();
settingsManager.setDefault(SettingsManager.SETTING_CAMERA_ID);
switchToGcamCapture();
} else {
- mSceneMode = CameraUtil.SCENE_MODE_HDR;
+ if (settingsManager.isHdrOn()) {
+ settingsManager.set(SettingsManager.SETTING_SCENE_MODE,
+ CameraUtil.SCENE_MODE_HDR);
+ } else {
+ settingsManager.set(SettingsManager.SETTING_SCENE_MODE,
+ Parameters.SCENE_MODE_AUTO);
+ }
updateParametersSceneMode();
+ mCameraDevice.setParameters(mParameters);
+ updateSceneMode();
}
}
};
// If scene mode is set, we cannot set flash mode, white balance, and
// focus mode, instead, we read it from driver
if (!Parameters.SCENE_MODE_AUTO.equals(mSceneMode)) {
- overrideCameraSettings(mParameters.getFlashMode(),
- mParameters.getWhiteBalance(), mParameters.getFocusMode());
+ overrideCameraSettings(mParameters.getFlashMode(), mParameters.getFocusMode());
}
}
- private void overrideCameraSettings(final String flashMode,
- final String whiteBalance, final String focusMode) {
+ private void overrideCameraSettings(final String flashMode, final String focusMode) {
SettingsManager settingsManager = mActivity.getSettingsManager();
settingsManager.set(SettingsManager.SETTING_FLASH_MODE, flashMode);
- settingsManager.set(SettingsManager.SETTING_WHITE_BALANCE, whiteBalance);
settingsManager.set(SettingsManager.SETTING_FOCUS_MODE, focusMode);
}
// Set flash mode.
updateParametersFlashMode();
- // Set white balance mode.
- updateParametersWhiteBalanceMode();
-
// Set focus mode.
mFocusManager.overrideFocusMode(null);
mParameters.setFocusMode(mFocusManager.getFocusMode());
}
}
- private void updateParametersWhiteBalanceMode() {
- SettingsManager settingsManager = mActivity.getSettingsManager();
-
- // Set white balance parameter.
- String whiteBalance = settingsManager.get(SettingsManager.SETTING_WHITE_BALANCE);
- if (CameraUtil.isSupported(whiteBalance,
- mParameters.getSupportedWhiteBalance())) {
- mParameters.setWhiteBalance(whiteBalance);
- }
- }
-
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
private void updateAutoFocusMoveCallback() {
if (mParameters.getFocusMode().equals(CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE)) {
enableTorchMode(settingsManager.isCameraBackFacing());
- // Set white balance parameter.
- String whiteBalance = settingsManager.get(SettingsManager.SETTING_WHITE_BALANCE);
- if (isSupported(whiteBalance,
- mParameters.getSupportedWhiteBalance())) {
- mParameters.setWhiteBalance(whiteBalance);
- } else {
- whiteBalance = mParameters.getWhiteBalance();
- if (whiteBalance == null) {
- whiteBalance = Parameters.WHITE_BALANCE_AUTO;
- }
- }
-
// Set zoom.
if (mParameters.isZoomSupported()) {
mParameters.setZoom(mZoomValue);
/** Standard mode options */
if (hardwareSpec.isFrontCameraSupported()) {
if (bottomBarSpec.enableCamera) {
- buttonManager.enableButton(ButtonManager.BUTTON_CAMERA,
- bottomBarSpec.cameraCallback);
+ buttonManager.initializeButton(ButtonManager.BUTTON_CAMERA,
+ bottomBarSpec.cameraCallback);
} else {
buttonManager.disableButton(ButtonManager.BUTTON_CAMERA);
}
} else {
if (hardwareSpec.isFlashSupported()) {
if (bottomBarSpec.enableFlash) {
- buttonManager.enableButton(ButtonManager.BUTTON_FLASH, bottomBarSpec.flashCallback);
+ buttonManager.initializeButton(ButtonManager.BUTTON_FLASH, bottomBarSpec.flashCallback);
} else if (bottomBarSpec.enableTorchFlash) {
- buttonManager.enableButton(ButtonManager.BUTTON_TORCH, bottomBarSpec.flashCallback);
+ buttonManager.initializeButton(ButtonManager.BUTTON_TORCH, bottomBarSpec.flashCallback);
} else {
buttonManager.disableButton(ButtonManager.BUTTON_FLASH);
}
} else {
if (hardwareSpec.isHdrPlusSupported()) {
if (bottomBarSpec.enableHdr && settingsManager.isCameraBackFacing()) {
- buttonManager.enableButton(ButtonManager.BUTTON_HDRPLUS,
- bottomBarSpec.hdrCallback);
+ buttonManager.initializeButton(ButtonManager.BUTTON_HDRPLUS,
+ bottomBarSpec.hdrCallback);
} else {
buttonManager.disableButton(ButtonManager.BUTTON_HDRPLUS);
}
} else if (hardwareSpec.isHdrSupported()) {
if (bottomBarSpec.enableHdr && settingsManager.isCameraBackFacing()) {
- buttonManager.enableButton(ButtonManager.BUTTON_HDR,
- bottomBarSpec.hdrCallback);
+ buttonManager.initializeButton(ButtonManager.BUTTON_HDR,
+ bottomBarSpec.hdrCallback);
} else {
buttonManager.disableButton(ButtonManager.BUTTON_HDR);
}
hideGridLines();
} else {
if (bottomBarSpec.enableGridLines) {
- buttonManager.enableButton(ButtonManager.BUTTON_GRID_LINES,
- bottomBarSpec.gridLinesCallback != null ?
- bottomBarSpec.gridLinesCallback : getGridLinesCallback());
+ buttonManager.initializeButton(ButtonManager.BUTTON_GRID_LINES,
+ bottomBarSpec.gridLinesCallback != null ?
+ bottomBarSpec.gridLinesCallback : getGridLinesCallback()
+ );
} else {
buttonManager.disableButton(ButtonManager.BUTTON_GRID_LINES);
hideGridLines();
if (bottomBarSpec.enablePanoOrientation
&& PhotoSphereHelper.getPanoramaOrientationOptionArrayId() > 0) {
- buttonManager.enableButton(ButtonManager.BUTTON_PANO_ORIENTATION,
+ buttonManager.initializeButton(ButtonManager.BUTTON_PANO_ORIENTATION,
bottomBarSpec.panoOrientationCallback);
} else {
buttonManager.hideButton(ButtonManager.BUTTON_PANO_ORIENTATION);
/** Intent UI */
if (bottomBarSpec.showCancel) {
- buttonManager.enablePushButton(ButtonManager.BUTTON_CANCEL,
- bottomBarSpec.cancelCallback);
+ buttonManager.initializePushButton(ButtonManager.BUTTON_CANCEL,
+ bottomBarSpec.cancelCallback);
}
if (bottomBarSpec.showDone) {
- buttonManager.enablePushButton(ButtonManager.BUTTON_DONE,
- bottomBarSpec.doneCallback);
+ buttonManager.initializePushButton(ButtonManager.BUTTON_DONE,
+ bottomBarSpec.doneCallback);
}
if (bottomBarSpec.showRetake) {
- buttonManager.enablePushButton(ButtonManager.BUTTON_RETAKE,
- bottomBarSpec.retakeCallback);
+ buttonManager.initializePushButton(ButtonManager.BUTTON_RETAKE,
+ bottomBarSpec.retakeCallback);
}
if (bottomBarSpec.showReview) {
- buttonManager.enablePushButton(ButtonManager.BUTTON_REVIEW,
- bottomBarSpec.reviewCallback,
- R.drawable.ic_play);
+ buttonManager.initializePushButton(ButtonManager.BUTTON_REVIEW,
+ bottomBarSpec.reviewCallback,
+ R.drawable.ic_play);
}
}
mKeyMap.put(SettingsManager.KEY_FLASH_MODE, SettingsManager.SETTING_FLASH_MODE);
mKeyMap.put(SettingsManager.KEY_VIDEOCAMERA_FLASH_MODE,
SettingsManager.SETTING_VIDEOCAMERA_FLASH_MODE);
- mKeyMap.put(SettingsManager.KEY_WHITE_BALANCE, SettingsManager.SETTING_WHITE_BALANCE);
mKeyMap.put(SettingsManager.KEY_SCENE_MODE, SettingsManager.SETTING_SCENE_MODE);
mKeyMap.put(SettingsManager.KEY_EXPOSURE, SettingsManager.SETTING_EXPOSURE);
- mKeyMap.put(SettingsManager.KEY_TIMER, SettingsManager.SETTING_TIMER);
- mKeyMap.put(SettingsManager.KEY_TIMER_SOUND_EFFECTS,
- SettingsManager.SETTING_TIMER_SOUND_EFFECTS);
mKeyMap.put(SettingsManager.KEY_VIDEO_EFFECT, SettingsManager.SETTING_VIDEO_EFFECT);
mKeyMap.put(SettingsManager.KEY_CAMERA_ID, SettingsManager.SETTING_CAMERA_ID);
mKeyMap.put(SettingsManager.KEY_CAMERA_HDR, SettingsManager.SETTING_CAMERA_HDR);
return SettingsManager.getFlashSetting(mContext);
case SettingsManager.SETTING_VIDEOCAMERA_FLASH_MODE:
return SettingsManager.getVideoFlashSetting(mContext);
- case SettingsManager.SETTING_WHITE_BALANCE:
- return SettingsManager.getWhiteBalanceSetting(mContext);
case SettingsManager.SETTING_SCENE_MODE:
return SettingsManager.getSceneModeSetting(mContext);
case SettingsManager.SETTING_EXPOSURE:
return SettingsManager.getExposureSetting(mContext, mCapabilities);
- case SettingsManager.SETTING_TIMER:
- return SettingsManager.getTimerSetting(mContext);
- case SettingsManager.SETTING_TIMER_SOUND_EFFECTS:
- return SettingsManager.getTimerSoundSetting(mContext);
case SettingsManager.SETTING_VIDEO_EFFECT:
return SettingsManager.getVideoEffectSetting(mContext);
case SettingsManager.SETTING_CAMERA_ID:
public static final int SETTING_FOCUS_MODE = 7;
public static final int SETTING_FLASH_MODE = 8;
public static final int SETTING_VIDEOCAMERA_FLASH_MODE = 9;
- public static final int SETTING_WHITE_BALANCE = 10;
public static final int SETTING_SCENE_MODE = 11;
public static final int SETTING_EXPOSURE = 12;
- public static final int SETTING_TIMER = 13;
- public static final int SETTING_TIMER_SOUND_EFFECTS = 14;
public static final int SETTING_VIDEO_EFFECT = 15;
public static final int SETTING_CAMERA_ID = 16;
public static final int SETTING_CAMERA_HDR = 17;
public static final String KEY_FOCUS_MODE = "pref_camera_focusmode_key";
public static final String KEY_FLASH_MODE = "pref_camera_flashmode_key";
public static final String KEY_VIDEOCAMERA_FLASH_MODE = "pref_camera_video_flashmode_key";
- public static final String KEY_WHITE_BALANCE = "pref_camera_whitebalance_key";
public static final String KEY_SCENE_MODE = "pref_camera_scenemode_key";
public static final String KEY_EXPOSURE = "pref_camera_exposure_key";
- public static final String KEY_TIMER = "pref_camera_timer_key";
- public static final String KEY_TIMER_SOUND_EFFECTS = "pref_camera_timer_sound_key";
public static final String KEY_VIDEO_EFFECT = "pref_video_effect_key";
public static final String KEY_CAMERA_ID = "pref_camera_id_key";
public static final String KEY_CAMERA_HDR = "pref_camera_hdr_key";
values, FLUSH_ON);
}
- public static Setting getWhiteBalanceSetting(Context context) {
- String defaultValue = context.getString(R.string.pref_camera_whitebalance_default);
- String[] values = context.getResources().getStringArray(
- R.array.pref_camera_whitebalance_entryvalues);
- return new Setting(SOURCE_CAMERA, TYPE_STRING, defaultValue, KEY_WHITE_BALANCE,
- values, FLUSH_OFF);
- }
-
public static Setting getHdrSetting(Context context) {
String defaultValue = context.getString(R.string.pref_camera_hdr_default);
String[] values = context.getResources().getStringArray(
values, FLUSH_OFF);
}
- public static Setting getTimerSetting(Context context) {
- String defaultValue = context.getString(R.string.pref_camera_timer_default);
- String[] values = null; // TODO: get the values dynamically.
- return new Setting(SOURCE_GLOBAL, TYPE_STRING, defaultValue, KEY_TIMER,
- values, FLUSH_OFF);
- }
-
- public static Setting getTimerSoundSetting(Context context) {
- String defaultValue = context.getString(R.string.pref_camera_timer_sound_default);
- String[] values = context.getResources().getStringArray(
- R.array.pref_camera_timer_sound_entryvalues);
- return new Setting(SOURCE_GLOBAL, TYPE_STRING, defaultValue, KEY_TIMER_SOUND_EFFECTS,
- values, FLUSH_OFF);
- }
-
public static Setting getVideoQualityBackSetting(Context context) {
String defaultValue = context.getString(R.string.pref_video_quality_default);
String[] values = context.getResources().getStringArray(
* Returns whether hdr plus mode is set on.
*/
public boolean isHdrPlusOn() {
+ String hdrOn = get(SettingsManager.SETTING_CAMERA_HDR_PLUS);
+ return hdrOn.equals(SettingsManager.VALUE_ON);
+ }
+
+ /**
+ * Returns whether hdr mode is set on.
+ */
+ public boolean isHdrOn() {
String hdrOn = get(SettingsManager.SETTING_CAMERA_HDR);
return hdrOn.equals(SettingsManager.VALUE_ON);
}
if (buttonManager.isEnabled(ButtonManager.BUTTON_HDRPLUS)
&& buttonManager.isVisible(ButtonManager.BUTTON_HDRPLUS)) {
setIndicatorState(mController.getSettingsManager(),
- SettingsManager.SETTING_CAMERA_HDR,
+ SettingsManager.SETTING_CAMERA_HDR_PLUS,
mHdrIndicator, mHdrPlusIndicatorIcons, false);
} else if (buttonManager.isEnabled(ButtonManager.BUTTON_HDR)
&& buttonManager.isVisible(ButtonManager.BUTTON_HDR)) {
syncFlashIndicator();
break;
}
+ case SettingsManager.SETTING_CAMERA_HDR_PLUS: {
+ syncHdrIndicator();
+ break;
+ }
case SettingsManager.SETTING_CAMERA_HDR: {
syncHdrIndicator();
break;
OSDN Git Service
