From 29ac761c49978b28fd7bcb939a0f48bd46ce9c78 Mon Sep 17 00:00:00 2001 From: Danny Baumann Date: Fri, 15 Jan 2016 08:59:20 +0100 Subject: Remove unused menu indicators code. Change-Id: I0ce48da277a532b46fdde15027f636de4d7585b7 --- AndroidManifest.xml | 8 - res/layout-land/keyguard_widget.xml | 63 -------- res/layout-port/keyguard_widget.xml | 60 ------- res/layout/camera_controls.xml | 8 - res/layout/menu_indicators.xml | 57 ------- res/layout/menu_indicators_keyguard.xml | 57 ------- res/values-large/dimens.xml | 1 - res/values-sw600dp/dimens.xml | 1 - res/values-sw640dp/dimens.xml | 2 - res/values-xlarge/dimens.xml | 2 - res/values/dimens.xml | 5 - src/com/android/camera/OnScreenIndicators.java | 205 ------------------------ src/com/android/camera/PanoCaptureUI.java | 16 -- src/com/android/camera/PhotoModule.java | 6 - src/com/android/camera/PhotoUI.java | 42 ----- src/com/android/camera/VideoModule.java | 6 - src/com/android/camera/VideoUI.java | 25 --- src/com/android/camera/WideAnglePanoramaUI.java | 3 +- src/com/android/camera/ui/CameraControls.java | 20 --- 19 files changed, 1 insertion(+), 586 deletions(-) delete mode 100644 res/layout-land/keyguard_widget.xml delete mode 100644 res/layout-port/keyguard_widget.xml delete mode 100644 res/layout/menu_indicators.xml delete mode 100644 res/layout/menu_indicators_keyguard.xml delete mode 100644 src/com/android/camera/OnScreenIndicators.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ff3fe68a6..5d1cbdcca 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -57,10 +57,6 @@ - - - - - - - - - - - - - - - - diff --git a/res/layout-port/keyguard_widget.xml b/res/layout-port/keyguard_widget.xml deleted file mode 100644 index 04816a35d..000000000 --- a/res/layout-port/keyguard_widget.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml index fee20f183..a59725aed 100755 --- a/res/layout/camera_controls.xml +++ b/res/layout/camera_controls.xml @@ -25,14 +25,6 @@ android:layout_gravity="bottom" android:clickable="true" /> - - - - - - - - - - - - - - - - - - diff --git a/res/layout/menu_indicators_keyguard.xml b/res/layout/menu_indicators_keyguard.xml deleted file mode 100644 index f3631f67e..000000000 --- a/res/layout/menu_indicators_keyguard.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/res/values-large/dimens.xml b/res/values-large/dimens.xml index d663a9d42..adecc58e7 100644 --- a/res/values-large/dimens.xml +++ b/res/values-large/dimens.xml @@ -18,5 +18,4 @@ @dimen/setting_row_height_large @dimen/setting_popup_window_width_large @dimen/setting_item_icon_width_large - @dimen/onscreen_indicators_height_large diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index 5ec2f19b4..d8e88c47a 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -18,7 +18,6 @@ @dimen/setting_row_height_large @dimen/setting_popup_window_width_large @dimen/setting_item_icon_width_large - @dimen/onscreen_indicators_height_large -33dp 80dip 16dip diff --git a/res/values-sw640dp/dimens.xml b/res/values-sw640dp/dimens.xml index 51b3dad21..8c5272daa 100644 --- a/res/values-sw640dp/dimens.xml +++ b/res/values-sw640dp/dimens.xml @@ -35,7 +35,5 @@ @dimen/effect_setting_clear_text_size_xlarge @dimen/effect_setting_clear_text_min_height_xlarge @dimen/effect_setting_type_text_left_padding_xlarge - @dimen/onscreen_indicators_height_xlarge - @dimen/onscreen_exposure_indicator_text_size_xlarge diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml index 51b3dad21..8c5272daa 100644 --- a/res/values-xlarge/dimens.xml +++ b/res/values-xlarge/dimens.xml @@ -35,7 +35,5 @@ @dimen/effect_setting_clear_text_size_xlarge @dimen/effect_setting_clear_text_min_height_xlarge @dimen/effect_setting_type_text_left_padding_xlarge - @dimen/onscreen_indicators_height_xlarge - @dimen/onscreen_exposure_indicator_text_size_xlarge diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 86654591d..6a62f6ab9 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -38,8 +38,6 @@ 20dp 45dp 16dp - 28dp - 15dp 16dp 96dp 44dp @@ -50,7 +48,6 @@ 260dp 72dp 48dp - 36dp 480dp 180dp 115dp @@ -72,8 +69,6 @@ 23dp 44dp 26dp - 36dp - 18dp 25dp 3dp 80dp diff --git a/src/com/android/camera/OnScreenIndicators.java b/src/com/android/camera/OnScreenIndicators.java deleted file mode 100644 index 9d07c49e2..000000000 --- a/src/com/android/camera/OnScreenIndicators.java +++ /dev/null @@ -1,205 +0,0 @@ -/* - * 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.util.Log; -import android.view.View; -import android.widget.ImageView; - -import org.codeaurora.snapcam.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); - mExposureIndicator.setVisibility(View.GONE); - mFlashIndicator.setVisibility(View.GONE); - mSceneIndicator.setVisibility(View.GONE); - mLocationIndicator.setVisibility(View.GONE); - mTimerIndicator.setVisibility(View.GONE); - mWBIndicator.setVisibility(View.GONE); - } - - /** - * 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(R.drawable.ic_settings); - } - - 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_RED_EYE, - * 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 if (Parameters.FLASH_MODE_RED_EYE.equals(value)) { - mFlashIndicator.setImageResource(R.drawable.ic_indicator_flash_redeye); - } 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); - } -} diff --git a/src/com/android/camera/PanoCaptureUI.java b/src/com/android/camera/PanoCaptureUI.java index a25ff9f94..2894e683c 100644 --- a/src/com/android/camera/PanoCaptureUI.java +++ b/src/com/android/camera/PanoCaptureUI.java @@ -80,9 +80,6 @@ public class PanoCaptureUI implements private ImageView mSceneModeLabelCloseIcon; private AlertDialog mSceneModeInstructionalDialog = null; - // Small indicators which show the camera settings in the viewfinder. - private OnScreenIndicators mOnScreenIndicators; - private AutoFitSurfaceView mSurfaceView = null; private Matrix mMatrix = null; private boolean mUIhidden = false; @@ -225,7 +222,6 @@ public class PanoCaptureUI implements mSceneModeLabelRect.setVisibility(View.GONE); } }); - initIndicators(); Point size = new Point(); mActivity.getWindowManager().getDefaultDisplay().getSize(size); @@ -278,11 +274,6 @@ public class PanoCaptureUI implements return mRootView; } - private void initIndicators() { - mOnScreenIndicators = new OnScreenIndicators(mActivity, - mRootView.findViewById(R.id.on_screen_indicators)); - } - public void onCameraOpened() { } @@ -354,13 +345,6 @@ public class PanoCaptureUI implements } else { hideUI(); } - setShowMenu(previewFocused); - } - - private void setShowMenu(boolean show) { - if (mOnScreenIndicators != null) { - mOnScreenIndicators.setVisibility(show ? View.VISIBLE : View.GONE); - } } public boolean collapseCameraControls() { diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 21d742bb9..9b1e22db4 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -547,8 +547,6 @@ public class PhotoModule case SET_PHOTO_UI_PARAMS: { setCameraParametersWhenIdle(UPDATE_PARAM_PREFERENCE); - mUI.updateOnScreenIndicators(mParameters, mPreferenceGroup, - mPreferences); break; } @@ -2802,8 +2800,6 @@ public class PhotoModule } mUI.initDisplayChangeListener(); keepScreenOnAwhile(); - mUI.updateOnScreenIndicators(mParameters, mPreferenceGroup, - mPreferences); UsageStatistics.onContentViewChanged( UsageStatistics.COMPONENT_CAMERA, "PhotoModule"); @@ -5098,8 +5094,6 @@ public class PhotoModule * later by posting a message to the handler */ if (mUI.mMenuInitialized) { setCameraParametersWhenIdle(UPDATE_PARAM_PREFERENCE); - mUI.updateOnScreenIndicators(mParameters, mPreferenceGroup, - mPreferences); mActivity.initPowerShutter(mPreferences); mActivity.initMaxBrightness(mPreferences); } else { diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 42d691e27..1ebf5449d 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -120,9 +120,6 @@ public class PhotoUI implements PieListener, private AlertDialog mLocationDialog; private SeekBar mBlurDegreeProgressBar; - // Small indicators which show the camera settings in the viewfinder. - private OnScreenIndicators mOnScreenIndicators; - private PieRenderer mPieRenderer; private ZoomRenderer mZoomRenderer; private RotateTextToast mNotSelectableToast; @@ -303,7 +300,6 @@ public class PhotoUI implements PieListener, mFaceView = (FaceView) mRootView.findViewById(R.id.face_view); setSurfaceTextureSizeChangedListener(mFaceView); } - initIndicators(); mAnimationManager = new AnimationManager(); mOrientationResize = false; mPrevOrientationResize = false; @@ -514,11 +510,6 @@ public class PhotoUI 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) { @@ -551,7 +542,6 @@ public class PhotoUI implements PieListener, mRenderOverlay.requestLayout(); initializeZoom(params); - updateOnScreenIndicators(params, prefGroup, prefs); mActivity.setPreviewGestures(mGestures); } @@ -716,29 +706,6 @@ public class PhotoUI implements PieListener, mMenu.overrideSettings(keyvalues); } - public void updateOnScreenIndicators(Camera.Parameters params, - PreferenceGroup group, ComboPreferences prefs) { - if (params == null || group == 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, CameraSettings.KEY_RECORD_LOCATION); - mOnScreenIndicators.updateLocationIndicator(location); - } - public void setCameraState(int state) { } @@ -803,7 +770,6 @@ public class PhotoUI implements PieListener, if (mPieRenderer != null) { mPieRenderer.setBlockFocus(!previewFocused); } - setShowMenu(previewFocused); if (!previewFocused && mCountDownView != null) mCountDownView.cancelCountDown(); } @@ -990,12 +956,6 @@ public class PhotoUI 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. @@ -1018,7 +978,6 @@ public class PhotoUI implements PieListener, mCameraControls.hideCameraSettings(); mDecodeTaskForReview = new DecodeImageForReview(jpegData, orientation, mirror); mDecodeTaskForReview.execute(); - mOnScreenIndicators.setVisibility(View.GONE); mMenuButton.setVisibility(View.GONE); CameraUtil.fadeIn(mReviewDoneButton); mShutterButton.setVisibility(View.INVISIBLE); @@ -1034,7 +993,6 @@ public class PhotoUI implements PieListener, mDecodeTaskForReview.cancel(true); } mReviewImage.setVisibility(View.GONE); - mOnScreenIndicators.setVisibility(View.VISIBLE); mMenuButton.setVisibility(View.VISIBLE); if (mMenu != null) { mMenu.hideTopMenu(false); diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index edfd9d2d0..c756ac856 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -3002,9 +3002,6 @@ public class VideoModule implements CameraModule, // Keep preview size up to date. mParameters = mCameraDevice.getParameters(); - // Update UI based on the new parameters. - mUI.updateOnScreenIndicators(mParameters, mPreferences); - mFocusManager.setPreviewSize(videoWidth, videoHeight); } @@ -3080,7 +3077,6 @@ public class VideoModule implements CameraModule, setCameraParameters(false); } mRestartPreview = false; - mUI.updateOnScreenIndicators(mParameters, mPreferences); Storage.setSaveSDCard( mPreferences.getString(CameraSettings.KEY_CAMERA_SAVEPATH, "0").equals("1")); mActivity.updateStorageSpaceAndHint(); @@ -3136,7 +3132,6 @@ public class VideoModule implements CameraModule, // Start switch camera animation. Post a message because // onFrameAvailable from the old camera may already exist. mHandler.sendEmptyMessage(SWITCH_CAMERA_START_ANIMATION); - mUI.updateOnScreenIndicators(mParameters, mPreferences); //Display timelapse msg depending upon selection in front/back camera. mUI.showTimeLapseUI(mCaptureTimeLapse); @@ -3220,7 +3215,6 @@ public class VideoModule implements CameraModule, } forceFlashOffIfSupported(forceOff); mCameraDevice.setParameters(mParameters); - mUI.updateOnScreenIndicators(mParameters, mPreferences); } @Override diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 93ec92405..a693d6424 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; @@ -996,7 +983,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(); @@ -1036,7 +1022,6 @@ public class VideoUI implements PieRenderer.PieListener, mMenuButton.setVisibility(View.GONE); mCameraControls.hideUI(); mVideoMenu.hideUI(); - mOnScreenIndicators.setVisibility(View.GONE); } public void hideReviewUI() { @@ -1045,20 +1030,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(); @@ -1072,7 +1048,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) { diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java index 46cf173bb..f2c6e2bb7 100644 --- a/src/com/android/camera/WideAnglePanoramaUI.java +++ b/src/com/android/camera/WideAnglePanoramaUI.java @@ -469,9 +469,8 @@ public class WideAnglePanoramaUI implements mShutterButton = (ShutterButton) mRootView.findViewById(R.id.shutter_button); mShutterButton.setImageResource(R.drawable.btn_new_shutter); mShutterButton.setOnShutterButtonListener(this); - // Hide menu and indicators. + // Hide menu mRootView.findViewById(R.id.menu).setVisibility(View.GONE); - mRootView.findViewById(R.id.on_screen_indicators).setVisibility(View.GONE); mReview.setBackgroundColor(mReviewBackground); // TODO: set display change listener properly. diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 30136bde5..00496a337 100755 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -60,7 +60,6 @@ public class CameraControls extends RotatableLayout { private View mHdrSwitcher; private View mTsMakeupSwitcher; private View mBokehSwitcher; - private View mIndicators; private View mPreview; private View mSceneModeSwitcher; private View mFilterModeSwitcher; @@ -141,7 +140,6 @@ public class CameraControls extends RotatableLayout { mMenu.setVisibility(View.INVISIBLE); mMute.setVisibility(View.INVISIBLE); mExitPanorama.setVisibility(View.INVISIBLE); - mIndicators.setVisibility(View.INVISIBLE); mPreview.setVisibility(View.INVISIBLE); isAnimating = false; enableTouch(true); @@ -168,7 +166,6 @@ public class CameraControls extends RotatableLayout { mMenu.setVisibility(View.INVISIBLE); mMute.setVisibility(View.INVISIBLE); mExitPanorama.setVisibility(View.INVISIBLE); - mIndicators.setVisibility(View.INVISIBLE); mPreview.setVisibility(View.INVISIBLE); isAnimating = false; enableTouch(true); @@ -295,8 +292,6 @@ public class CameraControls extends RotatableLayout { mViewList.add(mMute); if (mExitPanorama.getVisibility() == View.VISIBLE) mViewList.add(mExitPanorama); - if (mIndicators.getVisibility() == View.VISIBLE) - mViewList.add(mIndicators); } public void removeFromViewList(View view) { @@ -323,7 +318,6 @@ public class CameraControls extends RotatableLayout { mMute = findViewById(R.id.mute_button); mExitPanorama = findViewById(R.id.exit_panorama); mExitPanorama.setVisibility(View.GONE); - mIndicators = findViewById(R.id.on_screen_indicators); mPreview = findViewById(R.id.preview_thumb); mSceneModeSwitcher = findViewById(R.id.scene_mode_switcher); mFilterModeSwitcher = findViewById(R.id.filter_mode_switcher); @@ -409,7 +403,6 @@ public class CameraControls extends RotatableLayout { toIndex(mMenu, w, h, rotation, 4, 0, MENU_INDEX); toIndex(mMute, w, h, rotation, 3, 0, MUTE_INDEX); toIndex(mExitPanorama, w, h, rotation, 0, 0, EXIT_PANORAMA_INDEX); - toIndex(mIndicators, w, h, rotation, 0, 6, INDICATOR_INDEX); toIndex(mFrontBackSwitcher, w, h, rotation, 2, 0, FRONT_BACK_INDEX); toIndex(mPreview, w, h, rotation, 0, 6, PREVIEW_INDEX); if(TsMakeupManager.HAS_TS_MAKEUP) { @@ -526,7 +519,6 @@ public class CameraControls extends RotatableLayout { mSwitcher.setX(mLocX[idx1][SWITCHER_INDEX] - x); mShutter.setX(mLocX[idx1][SHUTTER_INDEX] - x); mVideoShutter.setX(mLocX[idx1][VIDEO_SHUTTER_INDEX] - x); - mIndicators.setX(mLocX[idx1][INDICATOR_INDEX] - x); mPreview.setX(mLocX[idx1][PREVIEW_INDEX] - x); mFrontBackSwitcher.setY(mLocY[idx1][FRONT_BACK_INDEX] + y); @@ -546,7 +538,6 @@ public class CameraControls extends RotatableLayout { mSwitcher.setY(mLocY[idx1][SWITCHER_INDEX] - y); mShutter.setY(mLocY[idx1][SHUTTER_INDEX] - y); mVideoShutter.setY(mLocY[idx1][VIDEO_SHUTTER_INDEX] - y); - mIndicators.setY(mLocY[idx1][INDICATOR_INDEX] - y); mPreview.setY(mLocY[idx1][PREVIEW_INDEX] - y); } @@ -598,7 +589,6 @@ public class CameraControls extends RotatableLayout { mMenu.animate().cancel(); mMute.animate().cancel(); mExitPanorama.animate().cancel(); - mIndicators.animate().cancel(); mPreview.animate().cancel(); mFrontBackSwitcher.animate().setListener(outlistener); ((ModuleSwitcher) mSwitcher).removePopup(); @@ -624,7 +614,6 @@ public class CameraControls extends RotatableLayout { mSwitcher.animate().translationYBy(mSize).setDuration(ANIME_DURATION); mShutter.animate().translationYBy(mSize).setDuration(ANIME_DURATION); mVideoShutter.animate().translationYBy(mSize).setDuration(ANIME_DURATION); - mIndicators.animate().translationYBy(mSize).setDuration(ANIME_DURATION); mPreview.animate().translationYBy(mSize).setDuration(ANIME_DURATION); break; case 90: @@ -646,7 +635,6 @@ public class CameraControls extends RotatableLayout { mSwitcher.animate().translationXBy(mSize).setDuration(ANIME_DURATION); mShutter.animate().translationXBy(mSize).setDuration(ANIME_DURATION); mVideoShutter.animate().translationXBy(mSize).setDuration(ANIME_DURATION); - mIndicators.animate().translationXBy(mSize).setDuration(ANIME_DURATION); mPreview.animate().translationXBy(mSize).setDuration(ANIME_DURATION); break; case 180: @@ -668,7 +656,6 @@ public class CameraControls extends RotatableLayout { mSwitcher.animate().translationYBy(-mSize).setDuration(ANIME_DURATION); mShutter.animate().translationYBy(-mSize).setDuration(ANIME_DURATION); mVideoShutter.animate().translationYBy(-mSize).setDuration(ANIME_DURATION); - mIndicators.animate().translationYBy(-mSize).setDuration(ANIME_DURATION); mPreview.animate().translationYBy(-mSize).setDuration(ANIME_DURATION); break; case 270: @@ -690,7 +677,6 @@ public class CameraControls extends RotatableLayout { mSwitcher.animate().translationXBy(-mSize).setDuration(ANIME_DURATION); mShutter.animate().translationXBy(-mSize).setDuration(ANIME_DURATION); mVideoShutter.animate().translationXBy(-mSize).setDuration(ANIME_DURATION); - mIndicators.animate().translationXBy(-mSize).setDuration(ANIME_DURATION); mPreview.animate().translationXBy(-mSize).setDuration(ANIME_DURATION); break; } @@ -720,7 +706,6 @@ public class CameraControls extends RotatableLayout { mMenu.animate().cancel(); mMute.animate().cancel(); mExitPanorama.animate().cancel(); - mIndicators.animate().cancel(); mPreview.animate().cancel(); if (mViewList != null) for (View v : mViewList) { @@ -732,7 +717,6 @@ public class CameraControls extends RotatableLayout { shutterAnim.stop(); mMenu.setVisibility(View.VISIBLE); - mIndicators.setVisibility(View.VISIBLE); mPreview.setVisibility(View.VISIBLE); mFrontBackSwitcher.animate().setListener(inlistener); @@ -758,7 +742,6 @@ public class CameraControls extends RotatableLayout { mSwitcher.animate().translationYBy(-mSize).setDuration(ANIME_DURATION); mShutter.animate().translationYBy(-mSize).setDuration(ANIME_DURATION); mVideoShutter.animate().translationYBy(-mSize).setDuration(ANIME_DURATION); - mIndicators.animate().translationYBy(-mSize).setDuration(ANIME_DURATION); mPreview.animate().translationYBy(-mSize).setDuration(ANIME_DURATION); break; case 90: @@ -782,7 +765,6 @@ public class CameraControls extends RotatableLayout { mSwitcher.animate().translationXBy(-mSize).setDuration(ANIME_DURATION); mShutter.animate().translationXBy(-mSize).setDuration(ANIME_DURATION); mVideoShutter.animate().translationXBy(-mSize).setDuration(ANIME_DURATION); - mIndicators.animate().translationXBy(-mSize).setDuration(ANIME_DURATION); mPreview.animate().translationXBy(-mSize).setDuration(ANIME_DURATION); break; case 180: @@ -806,7 +788,6 @@ public class CameraControls extends RotatableLayout { mSwitcher.animate().translationYBy(mSize).setDuration(ANIME_DURATION); mShutter.animate().translationYBy(mSize).setDuration(ANIME_DURATION); mVideoShutter.animate().translationYBy(mSize).setDuration(ANIME_DURATION); - mIndicators.animate().translationYBy(mSize).setDuration(ANIME_DURATION); mPreview.animate().translationYBy(mSize).setDuration(ANIME_DURATION); break; case 270: @@ -830,7 +811,6 @@ public class CameraControls extends RotatableLayout { mSwitcher.animate().translationXBy(mSize).setDuration(ANIME_DURATION); mShutter.animate().translationXBy(mSize).setDuration(ANIME_DURATION); mVideoShutter.animate().translationXBy(mSize).setDuration(ANIME_DURATION); - mIndicators.animate().translationXBy(mSize).setDuration(ANIME_DURATION); mPreview.animate().translationXBy(mSize).setDuration(ANIME_DURATION); break; } -- cgit v1.2.3