Projects >> android_packages_apps_Trebuchet >>1a0a07b88a3babc97e5255c5380f99caee77ff57

Chunk
Conflicting content
            dismissPreview(mPreviousView);
        }
        if (mNextView != null) {
        if (mPreviousView != null) {
    @Override
    protected void onPause() {
        super.onPause();
<<<<<<< HEAD
        // Some launcher layouts don't have a previous and next view
            dismissPreview(mNextView);
        }
=======
        mPaused = true;
        dismissPreview(mPreviousView);
        dismissPreview(mNextView);
>>>>>>> 08c2c99e74b424cc3efe98f62a9c9abc90200ce3
        mDragController.cancelDrag();
    }
Solution content
    @Override
    protected void onPause() {
        super.onPause();
        // Some launcher layouts don't have a previous and next view
        if (mPreviousView != null) {
            dismissPreview(mPreviousView);
        }
        if (mNextView != null) {
            dismissPreview(mNextView);
        }
        mDragController.cancelDrag();
    }
File
Launcher.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
If statement
Method invocation