Projects >> android-frameworks-base-with-screenshot-tweaks >>e5591771363ecfbdb0f850c2d43a33a2e64af65c

Chunk
Conflicting content 
    private ExtendedZoomControls mZoomControls;
    private Runnable mZoomControlRunnable;

<<<<<<< HEAD
    private ZoomButtonsController mZoomButtonsController;
=======
    private ZoomButtonsController mZoomButtonsController; 
    private ImageView mZoomOverviewButton;
>>>>>>> 1fcabd7b328ddde7008d4ba2c401aa7db371ae74

    // These keep track of the center point of the zoom.  They are used to
    // determine the point around which we should zoom.
Solution content 
    private ExtendedZoomControls mZoomControls;
    private Runnable mZoomControlRunnable;

    private ZoomButtonsController mZoomButtonsController;

    // These keep track of the center point of the zoom.  They are used to
    // determine the point around which we should zoom.
File
WebView.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
                    params;
            frameParams.gravity = Gravity.RIGHT;
        }
<<<<<<< HEAD
=======

        // Create the accessory buttons
        LayoutInflater inflater =
                (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
        ViewGroup container = mZoomButtonsController.getContainer();
        inflater.inflate(com.android.internal.R.layout.zoom_browser_accessory_buttons, container);
        mZoomOverviewButton =
                (ImageView) container.findViewById(com.android.internal.R.id.zoom_page_overview);
        mZoomOverviewButton.setOnClickListener(
            new View.OnClickListener() {
                public void onClick(View v) {
                    mZoomButtonsController.setVisible(false);
                    zoomScrollOut();
                    if (mLogEvent) {
                        Checkin.updateStats(mContext.getContentResolver(),
                                Checkin.Stats.Tag.BROWSER_ZOOM_OVERVIEW, 1, 0.0);
                    }
                }
            });
>>>>>>> 1fcabd7b328ddde7008d4ba2c401aa7db371ae74
    }

    private void updateZoomButtonsEnabled() {
Solution content 
                    params;
            frameParams.gravity = Gravity.RIGHT;
        }
    }

    private void updateZoomButtonsEnabled() {
File
WebView.java
Developer's decision
Version 1
Kind of conflict
Attribute
Cast expression
Comment
Method invocation
Variable