diff options
author | Wu-cheng Li <wuchengli@google.com> | 2011-05-21 16:18:37 +0800 |
---|---|---|
committer | Wu-cheng Li <wuchengli@google.com> | 2011-05-21 16:20:52 +0800 |
commit | 2049ccfd9b086f001e72c6d5e09876038fd18fa3 (patch) | |
tree | 8a5ed23ded56d52f60712fb91b016a9b30addffa | |
parent | e2eebff5a84e6981d81d0a9ac28322867099b295 (diff) | |
download | LegacyCamera-2049ccfd9b086f001e72c6d5e09876038fd18fa3.zip LegacyCamera-2049ccfd9b086f001e72c6d5e09876038fd18fa3.tar.gz LegacyCamera-2049ccfd9b086f001e72c6d5e09876038fd18fa3.tar.bz2 |
Fix NPE in phone UI.
Phone UI assumes the on-screen icon changes when the setting
changes. Time lapse interval does not have icons yet. Remove
it from phone UI for now.
bug:4473360
Change-Id: Id413ea5fec58e26b78e44db4ac30e6c2d2a29106
-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); |