diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-31 17:38:20 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-31 17:38:20 -0700 |
commit | 5c1207be90fdf296c1b83034b7c68915e1749284 (patch) | |
tree | e5679f6183458d8179821d5615dabafcb959704d /core/java/android/webkit | |
parent | a8675f67e33bc7337d148358783b0fd138b501ff (diff) | |
download | frameworks_base-5c1207be90fdf296c1b83034b7c68915e1749284.zip frameworks_base-5c1207be90fdf296c1b83034b7c68915e1749284.tar.gz frameworks_base-5c1207be90fdf296c1b83034b7c68915e1749284.tar.bz2 |
donut snapshot
Diffstat (limited to 'core/java/android/webkit')
-rw-r--r-- | core/java/android/webkit/LoadListener.java | 4 | ||||
-rw-r--r-- | core/java/android/webkit/MimeTypeMap.java | 1 | ||||
-rw-r--r-- | core/java/android/webkit/WebView.java | 23 |
3 files changed, 12 insertions, 16 deletions
diff --git a/core/java/android/webkit/LoadListener.java b/core/java/android/webkit/LoadListener.java index 474fa82..9ca2909 100644 --- a/core/java/android/webkit/LoadListener.java +++ b/core/java/android/webkit/LoadListener.java @@ -31,7 +31,6 @@ import android.os.Message; import android.security.CertTool; import android.util.Log; import android.webkit.CacheManager.CacheResult; -import android.widget.Toast; import com.android.internal.R; @@ -77,6 +76,7 @@ class LoadListener extends Handler implements EventHandler { static { sCertificateMimeTypeMap = new HashSet<String>(); sCertificateMimeTypeMap.add("application/x-x509-ca-cert"); + sCertificateMimeTypeMap.add("application/x-x509-user-cert"); sCertificateMimeTypeMap.add("application/x-pkcs12"); } @@ -1016,8 +1016,6 @@ class LoadListener extends Handler implements EventHandler { mDataBuilder.releaseChunk(c); } CertTool.getInstance().addCertificate(cert, mContext); - Toast.makeText(mContext, R.string.certificateSaved, - Toast.LENGTH_SHORT).show(); mBrowserFrame.stopLoading(); return; } diff --git a/core/java/android/webkit/MimeTypeMap.java b/core/java/android/webkit/MimeTypeMap.java index fdbc692..9fdde61 100644 --- a/core/java/android/webkit/MimeTypeMap.java +++ b/core/java/android/webkit/MimeTypeMap.java @@ -357,6 +357,7 @@ public /* package */ class MimeTypeMap { sMimeTypeMap.loadEntry( "application/x-webarchive", "webarchive", false); // added sMimeTypeMap.loadEntry("application/x-x509-ca-cert", "crt", false); + sMimeTypeMap.loadEntry("application/x-x509-user-cert", "crt", false); sMimeTypeMap.loadEntry("application/x-xcf", "xcf", false); sMimeTypeMap.loadEntry("application/x-xfig", "fig", false); sMimeTypeMap.loadEntry("audio/basic", "snd", false); diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index fcf946f..6936435 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -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); |