diff options
| author | Chung-yih Wang <cywang@google.com> | 2011-11-03 22:18:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-03 22:18:08 -0700 |
| commit | ee97c77fd2acae064e7ef4df63bf1323e2da81dd (patch) | |
| tree | 3793b510bf3a6b8d69fa2b41ba705e545e6e566b /src | |
| parent | 530a0dee238412cbdff39bd64295c74f39cc782e (diff) | |
| parent | dffce0bd29d78b0168ed71f4d5aa2bd7c8a6efa3 (diff) | |
| download | LegacyCamera-ee97c77fd2acae064e7ef4df63bf1323e2da81dd.zip LegacyCamera-ee97c77fd2acae064e7ef4df63bf1323e2da81dd.tar.gz LegacyCamera-ee97c77fd2acae064e7ef4df63bf1323e2da81dd.tar.bz2 | |
Merge "Fix 'back to the first-level when recording'." into ics-mr1
Diffstat (limited to 'src')
| -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 24451a9..3b8bea4 100644 --- a/src/com/android/camera/ui/IndicatorControlWheel.java +++ b/src/com/android/camera/ui/IndicatorControlWheel.java @@ -298,7 +298,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 @@ -317,7 +316,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] @@ -325,8 +323,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; } |