diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-09-19 08:02:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-19 08:02:04 -0700 |
| commit | cfa5dfffd63fe94f66b981bd72d50e293fe58f32 (patch) | |
| tree | b36c6b24660f3923c144cad8180a9ee9886c414b /src | |
| parent | 93fd3bcfa06ef1f525dced9e125ed6541071a865 (diff) | |
| parent | a27b8c0d0a1467994a9163df5f718002db504458 (diff) | |
| download | LegacyCamera-cfa5dfffd63fe94f66b981bd72d50e293fe58f32.zip LegacyCamera-cfa5dfffd63fe94f66b981bd72d50e293fe58f32.tar.gz LegacyCamera-cfa5dfffd63fe94f66b981bd72d50e293fe58f32.tar.bz2 | |
Merge "Initialise zoom controls in OnResume rather than OnCreate" into ics-factoryrom
Diffstat (limited to 'src')
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/VideoCamera.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 8c39f6b..f87e9b9 100644..100755 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -448,7 +448,6 @@ public class VideoCamera extends ActivityBase mBackCameraId = CameraHolder.instance().getBackCameraId(); mFrontCameraId = CameraHolder.instance().getFrontCameraId(); - initializeZoomControl(); initializeIndicatorControl(); } @@ -822,6 +821,10 @@ public class VideoCamera extends ActivityBase return; } } + + // Initializing it here after the preview is started. + initializeZoomControl(); + keepScreenOnAwhile(); // install an intent filter to receive SD card related events. |