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
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 @@
double increment = Math.toRadians(expectedAngle)
- mChildRadians[mSecondLevelStartIndex];
for (int i = 0 ; i < getChildCount(); ++i) mChildRadians[i] += increment;
- requestLayout();
}
@Override
@@ -314,7 +313,6 @@
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 @@
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;
}
