Fix the UI issue during video recording.

bug:5395575

Start recording when 2nd level settings are open, it should return to
1st level controls during recording with zoom control only displayed
When recording is stopped continue to display 1st level controls -
settings and switch camera icons reappear.

Change-Id: I502f2486c764dce8baa35cd45e00cd324930c894

1 files changed, 15 insertions, 5 deletions

diff --git a/src/com/android/camera/ui/IndicatorControlBarContainer.java b/src/com/android/camera/ui/IndicatorControlBarContainer.java
index cc35d59..6b60ace 100644
--- a/src/com/android/camera/ui/IndicatorControlBarContainer.java
+++ b/src/com/android/camera/ui/IndicatorControlBarContainer.java
@@ -32,8 +32,7 @@ import android.view.animation.AnimationUtils;
  * The IndicatorControlBarContainer is a IndicatorControl containing
  * IndicatorControlBar, SecondIndicatorControlBar and ZoomControlBar for Phone UI.
  */
-public class IndicatorControlBarContainer extends IndicatorControlContainer
-        implements OnIndicatorEventListener {
+public class IndicatorControlBarContainer extends IndicatorControlContainer {
     private static final String TAG = "IndicatorControlBarContainer";
 
     private Animation mFadeIn, mFadeOut;
@@ -107,6 +106,12 @@ public class IndicatorControlBarContainer extends IndicatorControlContainer
         }
     };
 
+    private void leaveSecondLevelIndicator() {
+        mIndicatorControlBar.startAnimation(mFadeIn);
+        mIndicatorControlBar.setVisibility(View.VISIBLE);
+        mSecondLevelIndicatorControlBar.startAnimation(mSecondLevelFadeOut);
+    }
+
     public void onIndicatorEvent(int event) {
         switch (event) {
             case OnIndicatorEventListener.EVENT_ENTER_SECOND_LEVEL_INDICATOR_BAR:
@@ -116,9 +121,7 @@ public class IndicatorControlBarContainer extends IndicatorControlContainer
                 break;
 
             case OnIndicatorEventListener.EVENT_LEAVE_SECOND_LEVEL_INDICATOR_BAR:
-                mIndicatorControlBar.startAnimation(mFadeIn);
-                mIndicatorControlBar.setVisibility(View.VISIBLE);
-                mSecondLevelIndicatorControlBar.startAnimation(mSecondLevelFadeOut);
+                leaveSecondLevelIndicator();
                 break;
         }
     }
@@ -167,4 +170,11 @@ public class IndicatorControlBarContainer extends IndicatorControlContainer
     public void enableZoom(boolean enabled) {
         mIndicatorControlBar.enableZoom(enabled);
     }
+
+    @Override
+    public void dismissSecondLevelIndicator() {
+        if (mSecondLevelIndicatorControlBar.getVisibility() == View.VISIBLE) {
+            leaveSecondLevelIndicator();
+        }
+    }
 }