diff options
author | Michael Kolb <kolby@google.com> | 2011-02-25 09:46:02 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-25 09:46:02 -0800 |
commit | edcc65514a0cfd99eeda82fd77d4e298bacbe737 (patch) | |
tree | 6de68aa3555e3ba430c2c3a751a1b5857a89d03f /src/com | |
parent | e6bf4abbb12a83fc0256d98d9d5cb36ee326f1ce (diff) | |
parent | 2491522de46709778df51bba89e4b51a3ab61742 (diff) | |
download | packages_apps_Browser-edcc65514a0cfd99eeda82fd77d4e298bacbe737.zip packages_apps_Browser-edcc65514a0cfd99eeda82fd77d4e298bacbe737.tar.gz packages_apps_Browser-edcc65514a0cfd99eeda82fd77d4e298bacbe737.tar.bz2 |
Merge "disable zoom buttons on m-touch screen only"
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/browser/XLargeUi.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java index 7a00422..f914183 100644 --- a/src/com/android/browser/XLargeUi.java +++ b/src/com/android/browser/XLargeUi.java @@ -20,6 +20,7 @@ import com.android.browser.ScrollWebView.ScrollListener; import android.app.ActionBar; import android.app.Activity; +import android.content.pm.PackageManager; import android.os.Bundle; import android.util.Log; import android.view.ActionMode; @@ -133,7 +134,9 @@ public class XLargeUi extends BaseUi implements ScrollListener { android.R.attr.webViewStyle, privateBrowsing); initWebViewSettings(w); w.setScrollListener(this); - w.getSettings().setDisplayZoomControls(false); + boolean supportsMultiTouch = mActivity.getPackageManager() + .hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH); + w.getSettings().setDisplayZoomControls(!supportsMultiTouch); w.setExpandedTileBounds(true); // smoother scrolling return w; } |