summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRockchip2015-04-29 16:26:57 +0800
committerRockchip2015-04-29 17:00:34 +0800
commitfcc333b324e7365e26c027d7fed0a1942f7e3d52 (patch)
tree40e28dc936c8e47d9a8f70e6c3ad08f02e6d4ccb
parentb6590fb48e9ec4dac7769752664fcaab8d16fa88 (diff)
fix commit 455190afb13a6ccd347a18ffefe7d8782dee237b
-rw-r--r--src/com/android/camera/VideoModule.java3
-rw-r--r--src/com/android/camera/VideoUI.java10
-rw-r--r--src/com/android/camera/ui/BottomBar.java2
3 files changed, 12 insertions, 3 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index a99fcb4..f363cc8 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -361,7 +361,7 @@ public class VideoModule extends CameraModule
mQuickCapture = mActivity.getIntent().getBooleanExtra(EXTRA_QUICK_CAPTURE, false);
mLocationManager = mActivity.getLocationManager();
- mUI.setOrientationIndicator(0, false);
+ //mUI.setOrientationIndicator(0, false);
setDisplayOrientation();
mPendingSwitchCameraId = -1;
@@ -871,6 +871,7 @@ public class VideoModule extends CameraModule
// Change the camera display orientation
if (mCameraDevice != null) {
mCameraDevice.setDisplayOrientation(mDisplayRotation);
+ mUI.setOrientationIndicator(0, false);
}
if (mFocusManager != null) {
mFocusManager.setDisplayOrientation(mCameraDisplayOrientation);
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 1276c84..4da3e2a 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -38,6 +38,7 @@ import com.android.ex.camera2.portability.CameraCapabilities;
import com.android.ex.camera2.portability.CameraSettings;
import java.util.List;
+import com.android.camera.util.CameraUtil;
public class VideoUI implements PreviewStatusListener {
private static final Log.Tag TAG = new Log.Tag("VideoUI");
@@ -153,7 +154,14 @@ public class VideoUI implements PreviewStatusListener {
mLabelsLinearLayout.setOrientation(LinearLayout.HORIZONTAL);
}
}
- mRecordingTimeRect.setOrientation(0, animation);
+ orientation = CameraUtil.getDisplayRotation(mActivity);
+ // android.util.Log.w("hjc","=====setOrientationIndicator=== orientation:"+orientation+" animation:"+animation);
+ if (orientation==90)
+ orientation = 0;
+ else if (orientation==270){
+ orientation = 180;
+ }
+ mRecordingTimeRect.setOrientation(orientation, animation);
}
private void initializeMiscControls() {
diff --git a/src/com/android/camera/ui/BottomBar.java b/src/com/android/camera/ui/BottomBar.java
index 2e04725..3d258de 100644
--- a/src/com/android/camera/ui/BottomBar.java
+++ b/src/com/android/camera/ui/BottomBar.java
@@ -310,7 +310,7 @@ public class BottomBar extends FrameLayout {
setBackgroundAlpha(mBackgroundAlphaOverlay);
setButtonImageLevels(1);
} else {
- setBackgroundAlpha(mBackgroundAlphaOverlay);
+ setBackgroundAlpha(mBackgroundAlphaDefault);
setButtonImageLevels(0);
}
}