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 --- src/com/android/camera/ui/CameraControls.java | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/com/android/camera/ui') 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