diff options
author | Danny Baumann <dannybaumann@web.de> | 2016-01-15 08:59:20 +0100 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 22:00:42 +0200 |
commit | 7ad3257b19464871c53eb4f11e98123fba35d6a0 (patch) | |
tree | 453e72bb27247ff15b457a8b7572c09814ce9470 /src/com/android/camera/PhotoUI.java | |
parent | 14169a17c4e88dd740ddfc8bfc1b9777dcba6b65 (diff) | |
download | android_packages_apps_Snap-7ad3257b19464871c53eb4f11e98123fba35d6a0.tar.gz android_packages_apps_Snap-7ad3257b19464871c53eb4f11e98123fba35d6a0.tar.bz2 android_packages_apps_Snap-7ad3257b19464871c53eb4f11e98123fba35d6a0.zip |
Remove unused menu indicators code.
Change-Id: I0ce48da277a532b46fdde15027f636de4d7585b7
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
-rw-r--r-- | src/com/android/camera/PhotoUI.java | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 96dda6f8a..b81578f6a 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -106,9 +106,6 @@ public class PhotoUI extends BaseUI implements PieListener, private MenuHelp mMenuHelp; private AlertDialog mLocationDialog; - // Small indicators which show the camera settings in the viewfinder. - private OnScreenIndicators mOnScreenIndicators; - private PieRenderer mPieRenderer; private ZoomRenderer mZoomRenderer; private RotateTextToast mNotSelectableToast; @@ -447,11 +444,6 @@ public class PhotoUI extends BaseUI implements PieListener, return mRootView; } - private void initIndicators() { - mOnScreenIndicators = new OnScreenIndicators(mActivity, - mRootView.findViewById(R.id.on_screen_indicators)); - } - public void onCameraOpened(PreferenceGroup prefGroup, ComboPreferences prefs, Camera.Parameters params, OnPreferenceChangedListener listener, MakeupLevelListener makeupListener) { if (mPieRenderer == null) { @@ -484,7 +476,6 @@ public class PhotoUI extends BaseUI implements PieListener, mRenderOverlay.requestLayout(); initializeZoom(params); - updateOnScreenIndicators(params, prefGroup, prefs); mActivity.setPreviewGestures(mGestures); } @@ -573,8 +564,6 @@ public class PhotoUI extends BaseUI implements PieListener, // called from onResume but only the first time public void initializeFirstTime() { - initIndicators(); - // Initialize shutter button. mShutterButton.setImageResource(R.drawable.btn_new_shutter); mShutterButton.setOnClickListener(new OnClickListener() { @@ -628,29 +617,6 @@ public class PhotoUI extends BaseUI implements PieListener, mMenu.overrideSettings(keyvalues); } - public void updateOnScreenIndicators(Camera.Parameters params, - PreferenceGroup group, ComboPreferences prefs) { - if (params == null || group == null || mOnScreenIndicators == null) return; - mOnScreenIndicators.updateSceneOnScreenIndicator(params.getSceneMode()); - mOnScreenIndicators.updateExposureOnScreenIndicator(params, - CameraSettings.readExposure(prefs)); - mOnScreenIndicators.updateFlashOnScreenIndicator(params.getFlashMode()); - int wbIndex = -1; - String wb = Camera.Parameters.WHITE_BALANCE_AUTO; - if (Camera.Parameters.SCENE_MODE_AUTO.equals(params.getSceneMode())) { - wb = params.getWhiteBalance(); - } - ListPreference pref = group.findPreference(CameraSettings.KEY_WHITE_BALANCE); - if (pref != null) { - wbIndex = pref.findIndexOfValue(wb); - } - // make sure the correct value was found - // otherwise use auto index - mOnScreenIndicators.updateWBIndicator(wbIndex < 0 ? 2 : wbIndex); - boolean location = RecordLocationPreference.get(prefs); - mOnScreenIndicators.updateLocationIndicator(location); - } - public void setAutoHdrEnabled(boolean enabled) { mCameraControls.setAutoHdrEnabled(enabled); } @@ -717,7 +683,6 @@ public class PhotoUI extends BaseUI implements PieListener, if (mPieRenderer != null) { mPieRenderer.setBlockFocus(!previewFocused); } - //setShowMenu(previewFocused); if (!previewFocused && mCountDownView != null) mCountDownView.cancelCountDown(); } @@ -905,12 +870,6 @@ public class PhotoUI extends BaseUI implements PieListener, } } - private void setShowMenu(boolean show) { - if (mOnScreenIndicators != null) { - mOnScreenIndicators.setVisibility(show ? View.VISIBLE : View.GONE); - } - } - public boolean collapseCameraControls() { // TODO: Mode switcher should behave like a popup and should hide itself when there // is a touch outside of it. @@ -933,7 +892,6 @@ public class PhotoUI extends BaseUI implements PieListener, mCameraControls.hideCameraSettings(); mDecodeTaskForReview = new DecodeImageForReview(jpegData, orientation, mirror); mDecodeTaskForReview.execute(); - mOnScreenIndicators.setVisibility(View.GONE); CameraUtil.fadeIn(mReviewDoneButton); mShutterButton.setVisibility(View.INVISIBLE); CameraUtil.fadeIn(mReviewRetakeButton); @@ -945,7 +903,6 @@ public class PhotoUI extends BaseUI implements PieListener, mDecodeTaskForReview.cancel(true); } mReviewImage.setVisibility(View.GONE); - mOnScreenIndicators.setVisibility(View.VISIBLE); CameraUtil.fadeOut(mReviewDoneButton); mShutterButton.setVisibility(View.VISIBLE); CameraUtil.fadeOut(mReviewRetakeButton); |