From 113fe528ff02d5f473138821a19f2886967d3eb7 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Fri, 7 Nov 2014 16:39:29 +0000
Subject: [PATCH] Backout 7ef4eeeace2e, bug 1093621, talos regressions
 (r=backout)

---
 mobile/android/base/NewTabletUI.java                      | 7 ++-----
 mobile/android/base/resources/xml/preferences_display.xml | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/mobile/android/base/NewTabletUI.java b/mobile/android/base/NewTabletUI.java
index 41c1ac34e741..887034a809b0 100644
--- a/mobile/android/base/NewTabletUI.java
+++ b/mobile/android/base/NewTabletUI.java
@@ -7,15 +7,12 @@ package org.mozilla.gecko;
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.preferences.GeckoPreferences;
 import org.mozilla.gecko.util.HardwareUtils;
 
 public class NewTabletUI {
-    // This value should be in sync with preferences_display.xml. On non-release
-    // builds, the preference UI will be hidden and the (unused) default
-    // preference UI value will still be 'true'.
-    private static final boolean DEFAULT = !AppConstants.RELEASE_BUILD;
+    // This value should be in sync with preferences_display.xml.
+    private static final boolean DEFAULT = false;
 
     private static Boolean sNewTabletUI;
 
diff --git a/mobile/android/base/resources/xml/preferences_display.xml b/mobile/android/base/resources/xml/preferences_display.xml
index d13fa0f3af9b..122103c45f12 100644
--- a/mobile/android/base/resources/xml/preferences_display.xml
+++ b/mobile/android/base/resources/xml/preferences_display.xml
@@ -27,7 +27,7 @@
 
     <CheckBoxPreference android:key="android.not_a_preference.new_tablet_ui"
                         android:title="@string/new_tablet_pref"
-                        android:defaultValue="true" />
+                        android:defaultValue="false" />
 
     <PreferenceCategory android:title="@string/pref_category_advanced">