diff options
author | Danny Baumann <dannybaumann@web.de> | 2016-01-15 08:59:20 +0100 |
---|---|---|
committer | Danny Baumann <dannybaumann@web.de> | 2016-01-20 23:31:18 -0800 |
commit | 42f6d5c06c5db74c6971e37dbb78bf41d2783e07 (patch) | |
tree | ea7305846f10d3ddfee87d19d6700a3de65d7bab /src/com/android/camera/VideoUI.java | |
parent | 4faa77d616d3637e628816da0d24bb0ea3432cd2 (diff) | |
download | android_packages_apps_Snap-42f6d5c06c5db74c6971e37dbb78bf41d2783e07.tar.gz android_packages_apps_Snap-42f6d5c06c5db74c6971e37dbb78bf41d2783e07.tar.bz2 android_packages_apps_Snap-42f6d5c06c5db74c6971e37dbb78bf41d2783e07.zip |
Remove unused menu indicators code.
Change-Id: I0ce48da277a532b46fdde15027f636de4d7585b7
Diffstat (limited to 'src/com/android/camera/VideoUI.java')
-rw-r--r-- | src/com/android/camera/VideoUI.java | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index a193fa82a..d5255ccbe 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -90,7 +90,6 @@ public class VideoUI implements PieRenderer.PieListener, private ZoomRenderer mZoomRenderer; private PreviewGestures mGestures; private View mMenuButton; - private OnScreenIndicators mOnScreenIndicators; private RotateLayout mRecordingTimeRect; private boolean mRecordingStarted = false; private VideoController mController; @@ -281,9 +280,6 @@ public class VideoUI implements PieRenderer.PieListener, }); mCameraControls = (CameraControls) mRootView.findViewById(R.id.camera_controls); - mOnScreenIndicators = new OnScreenIndicators(mActivity, - mRootView.findViewById(R.id.on_screen_indicators)); - mOnScreenIndicators.resetToDefault(); if (mController.isVideoCaptureIntent()) { hideSwitcher(); mActivity.getLayoutInflater().inflate(R.layout.review_module_control, @@ -639,16 +635,6 @@ public class VideoUI implements PieRenderer.PieListener, mPauseButton.setOnPauseButtonListener(this); } - public void updateOnScreenIndicators(Parameters param, ComboPreferences prefs) { - mOnScreenIndicators.updateExposureOnScreenIndicator(param, - CameraSettings.readExposure(prefs)); - mOnScreenIndicators.updateFlashOnScreenIndicator(param.getFlashMode()); - boolean location = RecordLocationPreference.get( - prefs, mActivity.getContentResolver()); - mOnScreenIndicators.updateLocationIndicator(location); - - } - public void setAspectRatio(double ratio) { if (mOrientationResize && CameraUtil.isScreenRotated(mActivity)) { ratio = 1 / ratio; @@ -896,7 +882,6 @@ public class VideoUI implements PieRenderer.PieListener, public void showRecordingUI(boolean recording) { mRecordingStarted = recording; mMenuButton.setVisibility(recording ? View.GONE : View.VISIBLE); - mOnScreenIndicators.setVisibility(recording ? View.GONE : View.VISIBLE); if (recording) { mShutterButton.setImageResource(R.drawable.shutter_button_video_stop); hideSwitcher(); @@ -934,27 +919,17 @@ public class VideoUI implements PieRenderer.PieListener, CameraUtil.fadeIn(mReviewPlayButton); mReviewImage.setVisibility(View.VISIBLE); mMenuButton.setVisibility(View.GONE); - mOnScreenIndicators.setVisibility(View.GONE); } public void hideReviewUI() { mReviewImage.setVisibility(View.GONE); mShutterButton.setEnabled(true); mMenuButton.setVisibility(View.VISIBLE); - mOnScreenIndicators.setVisibility(View.VISIBLE); CameraUtil.fadeOut(mReviewDoneButton); CameraUtil.fadeOut(mReviewPlayButton); CameraUtil.fadeIn(mShutterButton); } - private void setShowMenu(boolean show) { - if (mController.isVideoCaptureIntent()) - return; - if (mOnScreenIndicators != null) { - mOnScreenIndicators.setVisibility(show ? View.VISIBLE : View.GONE); - } - } - public void onPreviewFocusChanged(boolean previewFocused) { if (previewFocused) { showUI(); @@ -968,7 +943,6 @@ public class VideoUI implements PieRenderer.PieListener, // this can not happen in capture mode mRenderOverlay.setVisibility(previewFocused ? View.VISIBLE : View.GONE); } - setShowMenu(previewFocused); } public void initializePopup(PreferenceGroup pref) { |