Projects >> android_packages_apps_Camera >>a7690685f6aa94cd9338229bea62c3d25a505f38

Chunk
Conflicting content 
                }
        try {
            }).setIcon(android.R.drawable.ic_menu_camera);
        }
<<<<<<< HEAD

        mSwitchTimeLapseMenuItem = menu.add(Menu.NONE, Menu.NONE,
                MenuHelper.POSITION_SWITCH_TIME_LAPSE_MODE,
                R.string.enable_time_lapse_mode)
                .setOnMenuItemClickListener(new OnMenuItemClickListener() {
            public boolean onMenuItemClick(MenuItem item) {
                switchTimeLapseMode();
                return true;
            }
        }).setIcon(android.R.drawable.ic_menu_camera);
    }

    private void switchTimeLapseMode() {
        mCaptureTimeLapse = !mCaptureTimeLapse;

        finishRecorderAndCloseCamera();
        mHandler.removeMessages(INIT_RECORDER);

        // Read the video preferences
        readVideoPreferences();
        resetCameraParameters();

        // Restart preview
            startPreview();
        } catch (CameraHardwareException e) {
            showCameraErrorAndFinish();
            return;
        }

        // Reload the UI.
        initializeHeadUpDisplay();

        if (mSurfaceHolder != null) {
            mHandler.sendEmptyMessage(INIT_RECORDER);
        }

        // Change menu
        setTimeLapseSwitchTitle(!mCaptureTimeLapse);
=======
>>>>>>> d2861a4e01ec92a3086783572e535d4aee219161
    }

    private void switchCameraId(int cameraId) {
Solution content 
                }
            }).setIcon(android.R.drawable.ic_menu_camera);
        }

        mSwitchTimeLapseMenuItem = menu.add(Menu.NONE, Menu.NONE,
                MenuHelper.POSITION_SWITCH_TIME_LAPSE_MODE,
                R.string.enable_time_lapse_mode)
                .setOnMenuItemClickListener(new OnMenuItemClickListener() {
            public boolean onMenuItemClick(MenuItem item) {
                switchTimeLapseMode();
                return true;
            }
        }).setIcon(android.R.drawable.ic_menu_camera);
    }

    private void switchTimeLapseMode() {
        mCaptureTimeLapse = !mCaptureTimeLapse;

        finishRecorderAndCloseCamera();
        mHandler.removeMessages(INIT_RECORDER);

        // Read the video preferences
        readVideoPreferences();
        resetCameraParameters();

        // Restart preview
        try {
            startPreview();
        } catch (CameraHardwareException e) {
            showCameraErrorAndFinish();
            return;
        }

        // Reload the UI.
        initializeHeadUpDisplay();

        if (mSurfaceHolder != null) {
            mHandler.sendEmptyMessage(INIT_RECORDER);
        }

        // Change menu
        setTimeLapseSwitchTitle(!mCaptureTimeLapse);
    }

    private void switchCameraId(int cameraId) {
File
VideoCamera.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
If statement
Method invocation
Method signature
Try statement
Chunk
Conflicting content 
            } else {
                resetCameraParameters();
            }
<<<<<<< HEAD
        }
    }

    private class MyControlPanelListener implements ControlPanel.Listener {
        public void onSharedPreferenceChanged() {
            VideoCamera.this.onSharedPreferenceChanged();
=======
>>>>>>> d2861a4e01ec92a3086783572e535d4aee219161
        }
    }
}
Solution content 
            } else {
                resetCameraParameters();
            }
        }
    }

    private class MyControlPanelListener implements ControlPanel.Listener {
        public void onSharedPreferenceChanged() {
            VideoCamera.this.onSharedPreferenceChanged();
        }
    }
}
File
VideoCamera.java
Developer's decision
Version 1
Kind of conflict
Class signature
Method invocation
Method signature
Chunk
Conflicting content 
        addIndicator(context, group, CameraSettings.KEY_WHITE_BALANCE);
        addIndicator(context, group, CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE);
<<<<<<< HEAD
        if (mCaptureTimeLapse) {
            addIndicator(context, group, CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL);
            addIndicator(context, group, CameraSettings.KEY_VIDEO_TIME_LAPSE_QUALITY);
        } else {
            addIndicator(context, group, CameraSettings.KEY_VIDEO_QUALITY);
        }
=======
        addIndicator(context, group, CameraSettings.KEY_VIDEO_QUALITY);
>>>>>>> d2861a4e01ec92a3086783572e535d4aee219161
        addIndicator(context, group, CameraSettings.KEY_CAMERA_ID);
    }
}
Solution content 
        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);
            addIndicator(context, group, CameraSettings.KEY_VIDEO_TIME_LAPSE_QUALITY);
        } else {
            addIndicator(context, group, CameraSettings.KEY_VIDEO_QUALITY);
        }
        addIndicator(context, group, CameraSettings.KEY_CAMERA_ID);
    }
}
File
CamcorderHeadUpDisplay.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation