summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2011-11-02 14:35:28 +0800
committerChung-yih Wang <cywang@google.com>2011-11-02 15:27:23 +0800
commitf060a6491f31e2e4b545ac6d71995074b969c7a2 (patch)
treefb30158768afa9edbc0809fdc3693ee3b1bc4f52 /src
parentcd2256375a71ae4c19808d22c313d999cc750d0c (diff)
downloadLegacyCamera-f060a6491f31e2e4b545ac6d71995074b969c7a2.zip
LegacyCamera-f060a6491f31e2e4b545ac6d71995074b969c7a2.tar.gz
LegacyCamera-f060a6491f31e2e4b545ac6d71995074b969c7a2.tar.bz2
Fix the disabled icons overlapped issue.
bug:5515221 Change-Id: I9fe40f6492afdd8906ea2ad31839ec34f22a28b7
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/ui/IndicatorControlWheel.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/IndicatorControlWheel.java b/src/com/android/camera/ui/IndicatorControlWheel.java
index af36e11..2d6c5c9 100644
--- a/src/com/android/camera/ui/IndicatorControlWheel.java
+++ b/src/com/android/camera/ui/IndicatorControlWheel.java
@@ -309,7 +309,8 @@ public class IndicatorControlWheel extends IndicatorControl implements
// 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]