summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoUI.java
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2016-01-15 08:59:20 +0100
committerChippa-a <vusal1372@gmail.com>2019-10-25 15:55:25 +0300
commit04e8e62f370c4a5493fd863846f6fa54e6f1db77 (patch)
tree11aef38e63efa8e85e5fb23dfee1743c1e692d55 /src/com/android/camera/VideoUI.java
parent23cf762d88301274ccd786a52f2ea42003dd9dac (diff)
downloadandroid_packages_apps_Snap-04e8e62f370c4a5493fd863846f6fa54e6f1db77.tar.gz
android_packages_apps_Snap-04e8e62f370c4a5493fd863846f6fa54e6f1db77.tar.bz2
android_packages_apps_Snap-04e8e62f370c4a5493fd863846f6fa54e6f1db77.zip
Remove unused menu indicators code.
Change-Id: I0ce48da277a532b46fdde15027f636de4d7585b7
Diffstat (limited to 'src/com/android/camera/VideoUI.java')
-rwxr-xr-xsrc/com/android/camera/VideoUI.java25
1 files changed, 0 insertions, 25 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 4bd38bbbe..5e74ab940 100755
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -97,7 +97,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;
@@ -340,9 +339,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,
@@ -728,15 +724,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, CameraSettings.KEY_RECORD_LOCATION);
- mOnScreenIndicators.updateLocationIndicator(location);
-
- }
-
public void setAspectRatio(double ratio) {
if (mOrientationResize && CameraUtil.isScreenRotated(mActivity)) {
ratio = 1 / ratio;
@@ -991,7 +978,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();
@@ -1031,7 +1017,6 @@ public class VideoUI implements PieRenderer.PieListener,
mMenuButton.setVisibility(View.GONE);
mCameraControls.hideUI();
mVideoMenu.hideUI();
- mOnScreenIndicators.setVisibility(View.GONE);
}
public void hideReviewUI() {
@@ -1040,20 +1025,11 @@ public class VideoUI implements PieRenderer.PieListener,
mMenuButton.setVisibility(View.VISIBLE);
mCameraControls.showUI();
mVideoMenu.showUI();
- 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();
@@ -1067,7 +1043,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) {