[MediaWiki-commits] [Gerrit] [Gingerbread] Don't crash on setting zoom controls - change (apps...wikipedia)

2014-04-08 Thread Yuvipanda (Code Review) 
Yuvipanda has submitted this change and it was merged.

Change subject: [Gingerbread] Don't crash on setting zoom controls
..


[Gingerbread] Don't crash on setting zoom controls

Disables pinch-to-zoom on the web view on 2.3

Change-Id: I93acca15e8a10338ac243e8151c1883b175efa0d
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
1 file changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index e4eed65..d30ede7 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -139,9 +139,11 @@
 quickReturnBar = getActivity().findViewById(quickReturnBarId);
 tocSlider = (SlidingPaneLayout) 
getView().findViewById(R.id.page_toc_slider);
 
-// Enable Pinch-Zoom
-webView.getSettings().setBuiltInZoomControls(true);
-webView.getSettings().setDisplayZoomControls(false);
+if (Build.VERSION.SDK_INT = Build.VERSION_CODES.HONEYCOMB) {
+// Enable Pinch-Zoom
+webView.getSettings().setBuiltInZoomControls(true);
+webView.getSettings().setDisplayZoomControls(false);
+}
 
 bridge = new CommunicationBridge(webView, 
file:///android_asset/index.html);
 setupMessageHandlers();

-- 
To view, visit https://gerrit.wikimedia.org/r/122591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I93acca15e8a10338ac243e8151c1883b175efa0d
Gerrit-PatchSet: 6
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] [Gingerbread] Don't crash on setting zoom controls - change (apps...wikipedia)

2014-03-31 Thread Brion VIBBER (Code Review) 
Brion VIBBER has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/122591

Change subject: [Gingerbread] Don't crash on setting zoom controls
..

[Gingerbread] Don't crash on setting zoom controls

Disables pinch-to-zoom on the web view on 2.3

Change-Id: I93acca15e8a10338ac243e8151c1883b175efa0d
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/91/122591/1

diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index b8cde8c..0f975fb 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -139,9 +139,11 @@
 quickReturnBar = getActivity().findViewById(quickReturnBarId);
 tocSlider = (SlidingPaneLayout) 
getView().findViewById(R.id.page_toc_slider);
 
-// Enable Pinch-Zoom
-webView.getSettings().setBuiltInZoomControls(true);
-webView.getSettings().setDisplayZoomControls(false);
+if (Build.VERSION.SDK_INT = Build.VERSION_CODES.HONEYCOMB) {
+// Enable Pinch-Zoom
+webView.getSettings().setBuiltInZoomControls(true);
+webView.getSettings().setDisplayZoomControls(false);
+}
 
 bridge = new CommunicationBridge(webView, 
file:///android_asset/index.html);
 setupMessageHandlers();

-- 
To view, visit https://gerrit.wikimedia.org/r/122591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93acca15e8a10338ac243e8151c1883b175efa0d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER br...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits