From 30f0481931beed547656f2c7bc6290ecc9b01ac3 Mon Sep 17 00:00:00 2001 From: Chih-yu Huang Date: Thu, 8 Sep 2011 15:53:56 +0800 Subject: Change image of review control buttons. bug:5244256 Change-Id: Idf02f40edb7e2e15edb4fc1ac86a4694d9147661 --- src/com/android/camera/Camera.java | 7 +++---- src/com/android/camera/Util.java | 13 ++++++++++++- src/com/android/camera/VideoCamera.java | 6 +++--- 3 files changed, 18 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 2ddcc56..8973bac 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1268,7 +1268,6 @@ public class Camera extends ActivityBase implements FocusManager.Listener, mThumbnail.saveTo(new File(getFilesDir(), Thumbnail.LAST_THUMB_FILENAME)); } } - hidePostCaptureAlert(); } if (mDidRegister) { @@ -1768,8 +1767,8 @@ public class Camera extends ActivityBase implements FocusManager.Listener, private void showPostCaptureAlert() { if (mIsImageCaptureIntent) { - mShutterButton.setVisibility(View.GONE); - mIndicatorControlContainer.setVisibility(View.GONE); + Util.fadeOut(mIndicatorControlContainer); + Util.fadeOut(mShutterButton); int[] pickIds = {R.id.btn_retake, R.id.btn_done}; for (int id : pickIds) { @@ -1784,7 +1783,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, int[] pickIds = {R.id.btn_retake, R.id.btn_done}; for (int id : pickIds) { - (findViewById(id)).setVisibility(View.GONE); + Util.fadeOut(findViewById(id)); } Util.fadeIn(mShutterButton); diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java index aacf0ec..906dc1e 100644 --- a/src/com/android/camera/Util.java +++ b/src/com/android/camera/Util.java @@ -518,10 +518,21 @@ public class Util { } public static void fadeIn(View view) { + if (view.getVisibility() == View.VISIBLE) return; + view.setVisibility(View.VISIBLE); Animation animation = new AlphaAnimation(0F, 1F); - animation.setDuration(500); + animation.setDuration(400); + view.startAnimation(animation); + } + + public static void fadeOut(View view) { + if (view.getVisibility() != View.VISIBLE) return; + + Animation animation = new AlphaAnimation(1F, 0F); + animation.setDuration(400); view.startAnimation(animation); + view.setVisibility(View.GONE); } public static void setRotationParameter(Parameters parameters, int cameraId, int orientation) { diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index dcb0c23..d6a7e89 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -1593,8 +1593,8 @@ public class VideoCamera extends ActivityBase } } - mShutterButton.setVisibility(View.GONE); - mIndicatorControlContainer.setVisibility(View.GONE); + Util.fadeOut(mShutterButton); + Util.fadeOut(mIndicatorControlContainer); int[] pickIds = {R.id.btn_retake, R.id.btn_done, R.id.btn_play}; for (int id : pickIds) { Util.fadeIn(findViewById(id)); @@ -1608,7 +1608,7 @@ public class VideoCamera extends ActivityBase int[] pickIds = {R.id.btn_retake, R.id.btn_done, R.id.btn_play}; for (int id : pickIds) { - (findViewById(id)).setVisibility(View.GONE); + Util.fadeOut(findViewById(id)); } Util.fadeIn(mShutterButton); Util.fadeIn(mIndicatorControlContainer); -- cgit v1.1