diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-05-24 12:57:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-24 12:57:34 -0700 |
| commit | c3b311ea7c3718a8b8c704e29c5928c0537a0b64 (patch) | |
| tree | 4d62b2d2d77b1358de74be6e2b5f5a1e2cb3f0bd /src/com/android/camera/ui | |
| parent | 6fb969e2edd99340b3b77eae4e7b313a82937930 (diff) | |
| parent | 9bb90c3b940421a60251d2fb94b586461c544d5d (diff) | |
| download | LegacyCamera-c3b311ea7c3718a8b8c704e29c5928c0537a0b64.zip LegacyCamera-c3b311ea7c3718a8b8c704e29c5928c0537a0b64.tar.gz LegacyCamera-c3b311ea7c3718a8b8c704e29c5928c0537a0b64.tar.bz2 | |
am 9bb90c3b: am 2049ccfd: Fix NPE in phone UI.
* commit '9bb90c3b940421a60251d2fb94b586461c544d5d':
Fix NPE in phone UI.
Diffstat (limited to 'src/com/android/camera/ui')
| -rw-r--r-- | src/com/android/camera/ui/CamcorderHeadUpDisplay.java | 10 |
1 files changed, 2 insertions, 8 deletions
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); |