From 4faa77d616d3637e628816da0d24bb0ea3432cd2 Mon Sep 17 00:00:00 2001 From: Danny Baumann Date: Thu, 14 Jan 2016 14:56:10 +0100 Subject: Avoid static member variable. Change-Id: I3758bb219552d22768afa0af83c69c6a5460693b --- src/com/android/camera/PhotoMenu.java | 3 +-- src/com/android/camera/PhotoUI.java | 6 +++++- src/com/android/camera/VideoMenu.java | 3 +-- src/com/android/camera/VideoUI.java | 6 +++++- src/com/android/camera/WideAnglePanoramaUI.java | 2 +- src/com/android/camera/ui/CameraControls.java | 22 +++++++++++----------- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 7b719593d..e38c872c9 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -44,7 +44,6 @@ import android.widget.FrameLayout; import android.widget.FrameLayout.LayoutParams; import com.android.camera.CameraPreference.OnPreferenceChangedListener; -import com.android.camera.ui.CameraControls; import com.android.camera.ui.CountdownTimerPopup; import com.android.camera.ui.ListSubMenu; import com.android.camera.ui.ListMenu; @@ -1030,7 +1029,7 @@ public class PhotoMenu extends MenuController } public void openFirstLevel() { - if (isMenuBeingShown() || CameraControls.isAnimating()) + if (isMenuBeingShown() || mUI.isCameraControlsAnimating()) return; if (mListMenu == null || mPopupStatus != POPUP_FIRST_LEVEL) { initializePopup(); diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 481463fbb..6529051c8 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -531,12 +531,16 @@ public class PhotoUI implements PieListener, } } + public boolean isCameraControlsAnimating() { + return mCameraControls.isAnimating(); + } + public void initializeControlByIntent() { mThumbnail = (ImageView) mRootView.findViewById(R.id.preview_thumb); mThumbnail.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - if (!CameraControls.isAnimating() + if (!isCameraControlsAnimating() && mController.getCameraState() != PhotoController.SNAPSHOT_IN_PROGRESS) mActivity.gotoGallery(); } diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index e8aca488c..b2805ac56 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -38,7 +38,6 @@ import android.widget.LinearLayout; import android.widget.FrameLayout; import android.widget.FrameLayout.LayoutParams; -import com.android.camera.ui.CameraControls; import com.android.camera.ui.ListSubMenu; import com.android.camera.ui.ListMenu; import com.android.camera.ui.TimeIntervalPopup; @@ -641,7 +640,7 @@ public class VideoMenu extends MenuController } public void openFirstLevel() { - if (isMenuBeingShown() || CameraControls.isAnimating()) + if (isMenuBeingShown() || mUI.isCameraControlsAnimating()) return; if (mListMenu == null || mPopupStatus != POPUP_FIRST_LEVEL) { initializePopup(); diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 3f5a73ebd..a193fa82a 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -599,7 +599,7 @@ public class VideoUI implements PieRenderer.PieListener, @Override public void onClick(View v) { // Do not allow navigation to filmstrip during video recording - if (!mRecordingStarted && !CameraControls.isAnimating()) { + if (!mRecordingStarted && !isCameraControlsAnimating()) { mActivity.gotoGallery(); } } @@ -611,6 +611,10 @@ public class VideoUI implements PieRenderer.PieListener, mActivity.setPreviewGestures(mGestures); } + public boolean isCameraControlsAnimating() { + return mCameraControls.isAnimating(); + } + public void setPrefChangedListener(OnPreferenceChangedListener listener) { mVideoMenu.setListener(listener); } diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java index 862e4d2ba..d811b9580 100644 --- a/src/com/android/camera/WideAnglePanoramaUI.java +++ b/src/com/android/camera/WideAnglePanoramaUI.java @@ -124,7 +124,7 @@ public class WideAnglePanoramaUI implements mThumbnail.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - if (!CameraControls.isAnimating()) + if (!mCameraControls.isAnimating()) mActivity.gotoGallery(); } }); diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 892981eff..c0fbf13b4 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -61,7 +61,7 @@ public class CameraControls extends RotatableLayout { private int mSize; private static final int WIDTH_GRID = 5; private static final int HEIGHT_GRID = 7; - private static boolean isAnimating = false; + private boolean mAnimating = false; private ArrayList mViewList; private View[] mAllViews, mTopViews, mBottomViews; private static final int ANIME_DURATION = 300; @@ -92,7 +92,7 @@ public class CameraControls extends RotatableLayout { for (View v : mAllViews) { v.setVisibility(View.INVISIBLE); } - isAnimating = false; + mAnimating = false; enableTouch(true); } @@ -101,7 +101,7 @@ public class CameraControls extends RotatableLayout { for (View v : mAllViews) { v.setVisibility(View.INVISIBLE); } - isAnimating = false; + mAnimating = false; enableTouch(true); } }; @@ -118,13 +118,13 @@ public class CameraControls extends RotatableLayout { @Override public void onAnimationEnd(Animator animation) { - isAnimating = false; + mAnimating = false; enableTouch(true); } @Override public void onAnimationCancel(Animator animation) { - isAnimating = false; + mAnimating = false; enableTouch(true); } }; @@ -146,8 +146,8 @@ public class CameraControls extends RotatableLayout { this(context, null); } - public static boolean isAnimating() { - return isAnimating; + public boolean isAnimating() { + return mAnimating; } public void enableTouch(boolean enable) { @@ -399,9 +399,9 @@ public class CameraControls extends RotatableLayout { } public void hideUI() { - if(!isAnimating) + if (!mAnimating) enableTouch(false); - isAnimating = true; + mAnimating = true; int rotation = getUnifiedRotation(); for (View v : mAllViews) { v.animate().cancel(); @@ -434,9 +434,9 @@ public class CameraControls extends RotatableLayout { } public void showUI() { - if(!isAnimating) + if (!mAnimating) enableTouch(false); - isAnimating = true; + mAnimating = true; int rotation = getUnifiedRotation(); for (View v : mAllViews) { v.animate().cancel(); -- cgit v1.2.3