From 828d9150f0f27ac5adcbd7ec5082a96d65885655 Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Fri, 6 Jun 2014 11:42:22 -0400
Subject: [PATCH] Bug 1020045 - Turn on APZ overscrolling by default. r=kats

--HG--
extra : rebase_source : 695565006ca981462cfbde1a58a767974842ca64
---
 b2g/app/b2g.js                 | 2 +-
 b2g/chrome/content/settings.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index 6b3a530db30..f9639b00acf 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -955,7 +955,7 @@ pref("apz.axis_lock_mode", 2);
 pref("apz.subframe.enabled", true);
 
 // Overscroll-related settings
-pref("apz.overscroll.enabled", false);
+pref("apz.overscroll.enabled", true);
 pref("apz.overscroll.fling_friction", "0.02");
 pref("apz.overscroll.fling_stopped_threshold", "0.4");
 pref("apz.overscroll.clamping", "0.5");
diff --git a/b2g/chrome/content/settings.js b/b2g/chrome/content/settings.js
index a4542c9fe3a..eea2eafc0c5 100644
--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@@ -650,7 +650,7 @@ let settingsToObserve = {
     prefName: 'dom.browser_frames.useAsyncPanZoom',
     defaultValue: false
   },
-  'apz.overscroll.enabled': false,
+  'apz.overscroll.enabled': true,
   'debug.fps.enabled': {
     prefName: 'layers.acceleration.draw-fps',
     defaultValue: false