Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce (bacc5027) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/camera/VideoMenu.java

+31 −22

Original line number	Diff line number	Diff line
		@@ -59,12 +59,19 @@ public class VideoMenu extends PieController
		super.initialize(group);
		mPopup = null;
		mPopupStatus = POPUP_NONE;

		PieItem item = makeItem(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, POS_FLASH, 5);
		PieItem item = null;
		// flash
		if (group.findPreference(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE) != null) {
		item = makeItem(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, POS_FLASH, 5);
		mRenderer.addItem(item);
		}
		// white balance
		if (group.findPreference(CameraSettings.KEY_WHITE_BALANCE) != null) {
		item = makeItem(CameraSettings.KEY_WHITE_BALANCE, POS_WB, 5);
		mRenderer.addItem(item);
		}
		// camera switcher
		if (group.findPreference(CameraSettings.KEY_CAMERA_ID) != null) {
		item = makeItem(R.drawable.ic_switch_video_facing_holo_light);
		item.setPosition(POS_SWITCH, 5);
		item.setOnClickListener(new OnClickListener() {
		@@ -72,7 +79,8 @@ public class VideoMenu extends PieController
		@Override
		public void onClick(PieItem item) {
		// Find the index of next camera.
		ListPreference pref = mPreferenceGroup.findPreference(CameraSettings.KEY_CAMERA_ID);
		ListPreference pref =
		mPreferenceGroup.findPreference(CameraSettings.KEY_CAMERA_ID);
		if (pref != null) {
		int index = pref.findIndexOfValue(pref.getValue());
		CharSequence[] values = pref.getEntryValues();
		@@ -83,6 +91,7 @@ public class VideoMenu extends PieController
		}
		});
		mRenderer.addItem(item);
		}
		// settings popup
		mOtherKeys = new String[] {
		CameraSettings.KEY_VIDEO_EFFECT,