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

2 files changed, 14 insertions, 4 deletions

diff --git a/src/com/android/camera/ui/IndicatorControlWheel.java b/src/com/android/camera/ui/IndicatorControlWheel.java
index 2d6c5c91..5f3d82ac 100644
--- a/src/com/android/camera/ui/IndicatorControlWheel.java
+++ b/src/com/android/camera/ui/IndicatorControlWheel.java
@@ -135,9 +135,7 @@ public class IndicatorControlWheel extends IndicatorControl implements
         }
     }
 
-    @Override
-    public void onClick(View view) {
-        if (view == mZoomIcon) return;
+    private void changeIndicatorsLevel() {
         mPressedIndex = -1;
         dismissSettingPopup();
         mInAnimation = true;
@@ -145,6 +143,12 @@ public class IndicatorControlWheel extends IndicatorControl implements
         requestLayout();
     }
 
+    @Override
+    public void onClick(View view) {
+        if (view == mZoomIcon) return;
+        changeIndicatorsLevel();
+    }
+
     public void initialize(Context context, PreferenceGroup group,
             boolean isZoomSupported, String[] keys, String[] otherSettingKeys) {
         mShutterButtonRadius = IndicatorControlWheelContainer.SHUTTER_BUTTON_RADIUS;
@@ -493,4 +497,10 @@ public class IndicatorControlWheel extends IndicatorControl implements
             invalidate();
         }
     }
+
+    public void dismissSecondLevelIndicator() {
+        if (mCurrentLevel == 1) {
+            changeIndicatorsLevel();
+        }
+    }
 }
diff --git a/src/com/android/camera/ui/IndicatorControlWheelContainer.java b/src/com/android/camera/ui/IndicatorControlWheelContainer.java
index 29074c2a..a10136b2 100644
--- a/src/com/android/camera/ui/IndicatorControlWheelContainer.java
+++ b/src/com/android/camera/ui/IndicatorControlWheelContainer.java
@@ -223,6 +223,6 @@ public class IndicatorControlWheelContainer extends IndicatorControlContainer {
 
     @Override
     public void dismissSecondLevelIndicator() {
-        // TODO: back to first-level indicator set.
+        mIndicatorControlWheel.dismissSecondLevelIndicator();
     }
 }