diff options
author | Danny Baumann <dannybaumann@web.de> | 2016-01-14 14:56:10 +0100 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:44 +0200 |
commit | dd3a82b41a4bc6e6ffffc867280045dba657e60b (patch) | |
tree | 1b8f15d711fec62c69e7e7655c33b6bf1c0e7410 /src/com/android/camera | |
parent | 7532d6e58ac9a3a065c5e0640d57641e2f0ab1f0 (diff) | |
download | android_packages_apps_Snap-dd3a82b41a4bc6e6ffffc867280045dba657e60b.tar.gz android_packages_apps_Snap-dd3a82b41a4bc6e6ffffc867280045dba657e60b.tar.bz2 android_packages_apps_Snap-dd3a82b41a4bc6e6ffffc867280045dba657e60b.zip |
Avoid static member variable.
Change-Id: I3758bb219552d22768afa0af83c69c6a5460693b
Diffstat (limited to 'src/com/android/camera')
-rwxr-xr-x | src/com/android/camera/PhotoMenu.java | 1 | ||||
-rw-r--r-- | src/com/android/camera/PhotoUI.java | 4 | ||||
-rw-r--r-- | src/com/android/camera/VideoMenu.java | 3 | ||||
-rw-r--r-- | src/com/android/camera/VideoUI.java | 6 | ||||
-rw-r--r-- | src/com/android/camera/WideAnglePanoramaUI.java | 2 | ||||
-rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 22 |
6 files changed, 22 insertions, 16 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 46592b3a8..0ae9f7875 100755 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -52,7 +52,6 @@ import android.widget.FrameLayout.LayoutParams; import com.android.camera.CameraPreference.OnPreferenceChangedListener; import com.android.camera.TsMakeupManager.MakeupLevelListener; import com.android.camera.app.CameraApp; -import com.android.camera.ui.CameraControls; import com.android.camera.ui.CountdownTimerPopup; import com.android.camera.ui.ListSubMenu; import com.android.camera.ui.ListMenu; diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index c884e229d..6651d8317 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -557,6 +557,10 @@ public class PhotoUI implements PieListener, } } + public boolean isCameraControlsAnimating() { + return mCameraControls.isAnimating(); + } + public void initializeControlByIntent() { if (!mActivity.isSecureCamera()) { mThumbnail = (ImageView) mRootView.findViewById(R.id.preview_thumb); diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 76aa03287..9de83a1a1 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; @@ -661,7 +660,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 c0c995b42..f4b336b82 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -690,7 +690,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(); } } @@ -702,6 +702,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 46cf173bb..75defffa5 100644 --- a/src/com/android/camera/WideAnglePanoramaUI.java +++ b/src/com/android/camera/WideAnglePanoramaUI.java @@ -127,7 +127,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 d52f1e7b0..881225995 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -70,7 +70,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<View> mViewList; private static final int FRONT_BACK_INDEX = 0; private static final int HDR_INDEX = 1; @@ -133,7 +133,7 @@ public class CameraControls extends RotatableLayout { mMute.setVisibility(View.INVISIBLE); mIndicators.setVisibility(View.INVISIBLE); mPreview.setVisibility(View.INVISIBLE); - isAnimating = false; + mAnimating = false; enableTouch(true); } @@ -157,7 +157,7 @@ public class CameraControls extends RotatableLayout { mMute.setVisibility(View.INVISIBLE); mIndicators.setVisibility(View.INVISIBLE); mPreview.setVisibility(View.INVISIBLE); - isAnimating = false; + mAnimating = false; enableTouch(true); } }; @@ -174,14 +174,14 @@ public class CameraControls extends RotatableLayout { @Override public void onAnimationEnd(Animator animation) { - isAnimating = false; + mAnimating = false; resetLocation(0, 0); enableTouch(true); } @Override public void onAnimationCancel(Animator animation) { - isAnimating = false; + mAnimating = false; resetLocation(0, 0); enableTouch(true); } @@ -204,8 +204,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) { @@ -517,9 +517,9 @@ public class CameraControls extends RotatableLayout { } public void hideUI() { - if(!isAnimating) + if (!mAnimating) enableTouch(false); - isAnimating = true; + mAnimating = true; int rotation = getUnifiedRotation(); mFrontBackSwitcher.animate().cancel(); if(TsMakeupManager.HAS_TS_MAKEUP) { @@ -619,9 +619,9 @@ public class CameraControls extends RotatableLayout { } public void showUI() { - if(!isAnimating) + if (!mAnimating) enableTouch(false); - isAnimating = true; + mAnimating = true; int rotation = getUnifiedRotation(); mFrontBackSwitcher.animate().cancel(); if(TsMakeupManager.HAS_TS_MAKEUP) { |