Projects information

Chunk

Conflicting content
/@Override public void onTouchEvent(MotionEvent event) { <<<<<<< HEAD mRenderer.onTouchEvent(event); }/ ======= if (mRenderer != null) { mRenderer.onTouchEvent(event); } } >>>>>>> 81aa2696e202b0586b8d1c707a5fd74da8709f18 @Override public void onOffsetsChanged(float xOffset, float yOffset,

Conflicting content

        /*@Override
        public void onTouchEvent(MotionEvent event) {
<<<<<<< HEAD
            mRenderer.onTouchEvent(event);
        }*/
=======
            if (mRenderer != null) {
                mRenderer.onTouchEvent(event);
            }
        }
>>>>>>> 81aa2696e202b0586b8d1c707a5fd74da8709f18

        @Override
        public void onOffsetsChanged(float xOffset, float yOffset,

Solution content
/@Override public void onTouchEvent(MotionEvent event) { mRenderer.onTouchEvent(event); }/ @Override public void onOffsetsChanged(float xOffset, float yOffset,

File
RenderScriptWallpaper.java

Developer's decision
Version 1

Kind of conflict
Comment
If statement

Chunk

Conflicting content
@Override public void onOffsetsChanged(float xOffset, float yOffset, float xStep, float yStep, int xPixels, int yPixels) { <<<<<<< HEAD mRenderer.setOffset(xOffset, yOffset, xPixels, yPixels); ======= if (mRenderer != null) { mRenderer.setOffset(xOffset, yOffset, xStep, yStep, xPixels, yPixels); } >>>>>>> 81aa2696e202b0586b8d1c707a5fd74da8709f18 } @Override

Conflicting content

        @Override
        public void onOffsetsChanged(float xOffset, float yOffset,
                float xStep, float yStep, int xPixels, int yPixels) {
<<<<<<< HEAD
            mRenderer.setOffset(xOffset, yOffset, xPixels, yPixels);
=======
            if (mRenderer != null) {
                mRenderer.setOffset(xOffset, yOffset, xStep, yStep, xPixels, yPixels);
            }
>>>>>>> 81aa2696e202b0586b8d1c707a5fd74da8709f18
        }

        @Override

Solution content
@Override public void onOffsetsChanged(float xOffset, float yOffset, float xStep, float yStep, int xPixels, int yPixels) { mRenderer.setOffset(xOffset, yOffset, xPixels, yPixels); } @Override

File
RenderScriptWallpaper.java

Developer's decision
Version 1

Kind of conflict
If statement
Method invocation

Projects >> android_packages_wallpapers_MagicSmoke >>76afc31b5a9e7bf31dd56751904de8baef2f7502