Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 8677 into donut

Browse Source 
* changes:
  DO NOT MERGE.
This commit is contained in:
Android (Google) Code Review
2009-07-27 13:55:18 -07:00
parent ef9fd18d90 8268170d3f
commit 1fcabd7b32
2 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/android/webkit/WebView.java
View File

@@ -545,7 +545,6 @@ public class WebView extends AbsoluteLayout
private ZoomButtonsController mZoomButtonsController;
private ImageView mZoomOverviewButton;
private ImageView mZoomFitPageButton;
// These keep track of the center point of the zoom. They are used to
// determine the point around which we should zoom.
@@ -617,6 +616,16 @@ public class WebView extends AbsoluteLayout
// Create the buttons controller
mZoomButtonsController = new ZoomButtonsController(this);
mZoomButtonsController.setOnZoomListener(mZoomListener);
// ZoomButtonsController positions the buttons at the bottom, but in
// the middle. Change their layout parameters so they appear on the
// right.
View controls = mZoomButtonsController.getZoomControls();
ViewGroup.LayoutParams params = controls.getLayoutParams();
if (params instanceof FrameLayout.LayoutParams) {
FrameLayout.LayoutParams frameParams = (FrameLayout.LayoutParams)
params;
frameParams.gravity = Gravity.RIGHT;
}
// Create the accessory buttons
LayoutInflater inflater =
@@ -636,15 +645,6 @@ public class WebView extends AbsoluteLayout
}
}
});
mZoomFitPageButton =
(ImageView) container.findViewById(com.android.internal.R.id.zoom_fit_page);
mZoomFitPageButton.setOnClickListener(
new View.OnClickListener() {
public void onClick(View v) {
zoomWithPreview(mDefaultScale);
updateZoomButtonsEnabled();
}
});
}
private void updateZoomButtonsEnabled() {
@@ -654,17 +654,14 @@ public class WebView extends AbsoluteLayout
// Hide the zoom in and out buttons, as well as the fit to page
// button, if the page cannot zoom
mZoomButtonsController.getZoomControls().setVisibility(View.GONE);
mZoomFitPageButton.setVisibility(View.GONE);
} else {
// Bring back the hidden zoom controls.
mZoomButtonsController.getZoomControls()
.setVisibility(View.VISIBLE);
mZoomFitPageButton.setVisibility(View.VISIBLE);
// Set each one individually, as a page may be able to zoom in
// or out.
mZoomButtonsController.setZoomInEnabled(canZoomIn);
mZoomButtonsController.setZoomOutEnabled(canZoomOut);
mZoomFitPageButton.setEnabled(mActualScale != mDefaultScale);
}
mZoomOverviewButton.setVisibility(canZoomScrollOut() ? View.VISIBLE:
View.GONE);

11
core/res/res/layout/zoom_browser_accessory_buttons.xml
View File

@@ -18,18 +18,11 @@
*/
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView android:id="@+id/zoom_fit_page"
android:background="@android:drawable/btn_browser_zoom_fit_page"
<ImageView android:id="@+id/zoom_page_overview"
android:background="@android:drawable/btn_browser_zoom_page_overview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|left"
android:layout_marginLeft="7dip"
/>
<ImageView android:id="@+id/zoom_page_overview"
android:background="@android:drawable/btn_browser_zoom_page_overview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:layout_marginRight="7dip"
/>
</merge>