commit 1f56f129d65729705326f4d6852d760e6a5cacf5
author Chung-yih Wang <cywang@google.com> Wed Nov 02 19:17:09 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 02 19:17:09 2011 -0700
tree 05b7dc036188174998b1134bfacc8a88fcf5766c
parent 8e28d7356e181edc4c45cb3da6bfcd5f61fbaf92
parent a18e1141ed70a052d257a641c9a8b6f152a81d95

Merge "Back to the first-level when recording on Tablet." into ics-mr1

src/com/android/camera/ui/IndicatorControlWheel.java

diff --git a/src/com/android/camera/ui/IndicatorControlWheel.java b/src/com/android/camera/ui/IndicatorControlWheel.java
index 218584a..5f3d82a 100644
--- a/src/com/android/camera/ui/IndicatorControlWheel.java
+++ b/src/com/android/camera/ui/IndicatorControlWheel.java
@@ -313,7 +313,8 @@
         // The icons are spreaded on the left side of the shutter button.
         for (int i = 0; i < getChildCount(); ++i) {
             View view = getChildAt(i);
-            if (!view.isEnabled()) continue;
+            // 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]