diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-05-23 20:08:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-23 20:08:59 -0700 |
| commit | 9bb90c3b940421a60251d2fb94b586461c544d5d (patch) | |
| tree | 8a5ed23ded56d52f60712fb91b016a9b30addffa | |
| parent | 41fff6e73898387612b17737085ad2321a2727c4 (diff) | |
| parent | 2049ccfd9b086f001e72c6d5e09876038fd18fa3 (diff) | |
| download | LegacyCamera-9bb90c3b940421a60251d2fb94b586461c544d5d.zip LegacyCamera-9bb90c3b940421a60251d2fb94b586461c544d5d.tar.gz LegacyCamera-9bb90c3b940421a60251d2fb94b586461c544d5d.tar.bz2 | |
am 2049ccfd: Fix NPE in phone UI.
* commit '2049ccfd9b086f001e72c6d5e09876038fd18fa3':
Fix NPE in phone UI.
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 3 | ||||
| -rw-r--r-- | src/com/android/camera/ui/CamcorderHeadUpDisplay.java | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index ec279cc..7d67270 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -487,8 +487,7 @@ public class VideoCamera extends ActivityBase if (mIsVideoCaptureIntent) { mPreferenceGroup = filterPreferenceScreenByIntent(mPreferenceGroup); } - mHeadUpDisplay.initialize(this, mPreferenceGroup, - mOrientationCompensation, mCaptureTimeLapse); + mHeadUpDisplay.initialize(this, mPreferenceGroup, mOrientationCompensation); } private void attachHeadUpDisplay() { diff --git a/src/com/android/camera/ui/CamcorderHeadUpDisplay.java b/src/com/android/camera/ui/CamcorderHeadUpDisplay.java index 09236c8..6d4ef55 100644 --- a/src/com/android/camera/ui/CamcorderHeadUpDisplay.java +++ b/src/com/android/camera/ui/CamcorderHeadUpDisplay.java @@ -34,10 +34,8 @@ public class CamcorderHeadUpDisplay extends HeadUpDisplay { super(context); } - public void initialize(Context context, PreferenceGroup group, - int initialOrientation, boolean captureTimeLapse) { + public void initialize(Context context, PreferenceGroup group, int initialOrientation) { mInitialOrientation = initialOrientation; - mCaptureTimeLapse = captureTimeLapse; super.initialize(context, group); } @@ -66,11 +64,7 @@ public class CamcorderHeadUpDisplay extends HeadUpDisplay { addIndicator(context, group, CameraSettings.KEY_WHITE_BALANCE); addIndicator(context, group, CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE); - if (mCaptureTimeLapse) { - addIndicator(context, group, CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL); - } else { - addIndicator(context, group, CameraSettings.KEY_VIDEO_QUALITY); - } + addIndicator(context, group, CameraSettings.KEY_VIDEO_QUALITY); addIndicator(context, group, CameraSettings.KEY_CAMERA_ID); mIndicatorBar.setOrientation(mInitialOrientation); |