Projects >> android-frameworks-base-with-remote-control-service >>1b810a5706cc5ba29ac59df15a09101587468c7c

Chunk
Conflicting content 
                        if (Math.abs((viewWidth * mInvActualScale)
                                - mZoomOverviewWidth) > 1) {
                            setNewZoomScale((float) viewWidth
<<<<<<< HEAD
                                    / mZoomOverviewWidth, false);
=======
                                    / mZoomOverviewWidth, Math.abs(mActualScale
                                            - mTextWrapScale) < 0.01f, false);
>>>>>>> 88196464e91dd533f2dd28a02f55b7e4801eead0
                        }
                    }
                    if (draw.mFocusSizeChanged && inEditingMode()) {
Solution content 
                        if (Math.abs((viewWidth * mInvActualScale)
                                - mZoomOverviewWidth) > 1) {
                            setNewZoomScale((float) viewWidth
                                    / mZoomOverviewWidth, false);
                        }
                    }
                    if (draw.mFocusSizeChanged && inEditingMode()) {
File
WebView.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation