Projects >> android_packages_apps_Camera >>6b3091e9dcc6b717ee802fafc386d96ff466b928

Chunk
Conflicting content 
import android.view.ViewStub;
import android.widget.RelativeLayout;

<<<<<<< HEAD
=======
import com.android.camera.ui.LayoutChangeHelper;
import com.android.camera.ui.LayoutChangeNotifier;
import com.android.gallery3d.common.ApiHelper;

>>>>>>> a78d520dd27ae7f1124dfc93f1809ba7a38811b5
/**
 * A layout which handles the preview aspect ratio.
 */
Solution content 
import android.widget.RelativeLayout;

/**
 * A layout which handles the preview aspect ratio.
 */
File
PreviewFrameLayout.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
                        mTimeBetweenTimeLapseFrameCaptureMs,
                        mRecordingStartTime);
            }
<<<<<<< HEAD
=======
            // The camera is not allowed to be accessed in older api levels during
            // recording. It is therefore necessary to hide the zoom UI on older
            // platforms.
            // See the documentation of android.media.MediaRecorder.start() for
            // further explanation.
            if (!ApiHelper.HAS_ZOOM_WHEN_RECORDING
                    && mParameters.isZoomSupported()) {
                mZoomControl.setVisibility(View.GONE);
            }
>>>>>>> a78d520dd27ae7f1124dfc93f1809ba7a38811b5
        } else {
            if (mThumbnailView != null) mThumbnailView.setEnabled(true);
            mShutterButton.setImageResource(R.drawable.btn_shutter_video);
Solution content 
                        mTimeBetweenTimeLapseFrameCaptureMs,
                        mRecordingStartTime);
            }
        } else {
            if (mThumbnailView != null) mThumbnailView.setEnabled(true);
            mShutterButton.setImageResource(R.drawable.btn_shutter_video);
File
VideoCamera.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Chunk
Conflicting content 
            if (mCaptureTimeLapse) {
                mIndicatorControlContainer.stopTimeLapseAnimation();
            }
<<<<<<< HEAD
=======
            if (!ApiHelper.HAS_ZOOM_WHEN_RECORDING
                    && mParameters.isZoomSupported()) {
                mZoomControl.setVisibility(View.VISIBLE);
            }
>>>>>>> a78d520dd27ae7f1124dfc93f1809ba7a38811b5
        }
    }
Solution content 
            if (mCaptureTimeLapse) {
                mIndicatorControlContainer.stopTimeLapseAnimation();
            }
        }
    }
File
VideoCamera.java
Developer's decision
Version 1
Kind of conflict
If statement