diff options
| author | Chung-yih Wang <cywang@google.com> | 2011-11-03 17:38:50 +0800 |
|---|---|---|
| committer | Chung-yih Wang <cywang@google.com> | 2011-11-03 17:38:50 +0800 |
| commit | dffce0bd29d78b0168ed71f4d5aa2bd7c8a6efa3 (patch) | |
| tree | 42de07b3a6b48dd44f78e42dff82029d3268535e | |
| parent | 1f56f129d65729705326f4d6852d760e6a5cacf5 (diff) | |
| download | LegacyCamera-dffce0bd29d78b0168ed71f4d5aa2bd7c8a6efa3.zip LegacyCamera-dffce0bd29d78b0168ed71f4d5aa2bd7c8a6efa3.tar.gz LegacyCamera-dffce0bd29d78b0168ed71f4d5aa2bd7c8a6efa3.tar.bz2 | |
Fix 'back to the first-level when recording'.
bug:5395575
Originally we have the fix for back to the first-level when recording,
but it has another side-effect after merging the fix of icons overlapped issue.
This change will fix the issue and make sure the available indicator is
zoom control only during recording.
Change-Id: Ic674c0a2c92a88c2cd2a3586a703f27784415582
| -rw-r--r-- | src/com/android/camera/ui/IndicatorControlWheel.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/camera/ui/IndicatorControlWheel.java b/src/com/android/camera/ui/IndicatorControlWheel.java index 5f3d82a..4e0e5f4 100644 --- a/src/com/android/camera/ui/IndicatorControlWheel.java +++ b/src/com/android/camera/ui/IndicatorControlWheel.java @@ -295,7 +295,6 @@ public class IndicatorControlWheel extends IndicatorControl implements double increment = Math.toRadians(expectedAngle) - mChildRadians[mSecondLevelStartIndex]; for (int i = 0 ; i < getChildCount(); ++i) mChildRadians[i] += increment; - requestLayout(); } @Override @@ -314,7 +313,6 @@ public class IndicatorControlWheel extends IndicatorControl implements for (int i = 0; i < getChildCount(); ++i) { View view = getChildAt(i); // We still need to show the disabled indicators in the second level. - if (!view.isEnabled() && (mCurrentLevel == 0)) continue; double radian = mChildRadians[i]; double startVisibleRadians = mInAnimation ? mStartVisibleRadians[1] @@ -322,8 +320,9 @@ public class IndicatorControlWheel extends IndicatorControl implements double endVisibleRadians = mInAnimation ? mEndVisibleRadians[1] : mEndVisibleRadians[mCurrentLevel]; - if ((radian < (startVisibleRadians - HIGHLIGHT_RADIANS / 2)) || - (radian > (endVisibleRadians + HIGHLIGHT_RADIANS / 2))) { + if ((!view.isEnabled() && (mCurrentLevel == 0)) + || (radian < (startVisibleRadians - HIGHLIGHT_RADIANS / 2)) + || (radian > (endVisibleRadians + HIGHLIGHT_RADIANS / 2))) { view.setVisibility(View.GONE); continue; } |