summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/Camera.java3
-rw-r--r--src/com/android/camera/ui/IndicatorControlBarContainer.java4
2 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 1274a72..26d4497 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -49,7 +49,6 @@ import android.os.Message;
import android.os.MessageQueue;
import android.os.SystemClock;
import android.provider.MediaStore;
-import android.provider.Settings;
import android.util.Log;
import android.view.GestureDetector;
import android.view.Gravity;
@@ -62,7 +61,6 @@ import android.view.OrientationEventListener;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.view.View;
-import android.view.Window;
import android.view.WindowManager;
import android.view.animation.AnimationUtils;
import android.widget.TextView;
@@ -952,6 +950,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
mIndicatorControlContainer.initialize(this, mPreferenceGroup,
mParameters.isZoomSupported(),
SETTING_KEYS, OTHER_SETTING_KEYS);
+ updateSceneModeUI();
mIndicatorControlContainer.setListener(this);
}
diff --git a/src/com/android/camera/ui/IndicatorControlBarContainer.java b/src/com/android/camera/ui/IndicatorControlBarContainer.java
index 9c01e01..cc35d59 100644
--- a/src/com/android/camera/ui/IndicatorControlBarContainer.java
+++ b/src/com/android/camera/ui/IndicatorControlBarContainer.java
@@ -154,9 +154,7 @@ public class IndicatorControlBarContainer extends IndicatorControlContainer
@Override
public void overrideSettings(final String ... keyvalues) {
- if (mSecondLevelIndicatorControlBar.getVisibility() == View.VISIBLE) {
- mSecondLevelIndicatorControlBar.overrideSettings(keyvalues);
- }
+ mSecondLevelIndicatorControlBar.overrideSettings(keyvalues);
}
@Override