Merge "Add public API for on screen zoom controls" into honeycomb (debb5bbe) · Commits · e / os / android_frameworks_base

api/current.xml

+24 −0

Original line number	Diff line number	Diff line
		@@ -234861,6 +234861,17 @@
		visibility="public"
		>
		</method>
		<method name="getDisplayZoomControls"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getDomStorageEnabled"
		return="boolean"
		abstract="false"
		@@ -235355,6 +235366,19 @@
		<parameter name="zoom" type="android.webkit.WebSettings.ZoomDensity">
		</parameter>
		</method>
		<method name="setDisplayZoomControls"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="enabled" type="boolean">
		</parameter>
		</method>
		<method name="setDomStorageEnabled"
		return="void"
		abstract="false"

+0 −2

Original line number	Diff line number	Diff line
		@@ -571,7 +571,6 @@ public class WebSettings {
		* A combination of built in zoom controls enabled
		* and on screen zoom controls disabled allows for pinch to zoom
		* to work without the on screen controls
		* @hide
		*/
		public void setDisplayZoomControls(boolean enabled) {
		mDisplayZoomControls = enabled;
		@@ -580,7 +579,6 @@ public class WebSettings {

		/**
		* Returns true if the on screen zoom buttons are being used.
		* @hide
		*/
		public boolean getDisplayZoomControls() {
		return mDisplayZoomControls;