commit 53e21b8e779e3c39493c9884cd844c3bedd217b7
author John Reck <jreck@google.com> Fri Oct 28 22:27:25 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 28 22:27:25 2011 +0000
tree b1b00b4da1d988156cbe422569d7a4f8bcfeca93
parent 0bbeeaa832c0df5f55b0ce0970a7f493bf5fe3c8
parent d27d769bc23b88d97bbdf6a40384977afbd7a69d

am d27d769b: Merge "Don\'t set the upload type unless in debug" into ics-mr1

* commit 'd27d769bc23b88d97bbdf6a40384977afbd7a69d':
  Don't set the upload type unless in debug

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index f92e53b..e2a521a 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -271,14 +271,18 @@
             settings.setUserAgentString(USER_AGENTS[getUserAgent()]);
         }
 
+        boolean useInverted = useInvertedRendering();
         settings.setProperty(WebViewProperties.gfxInvertedScreen,
-                useInvertedRendering() ? "true" : "false");
+                useInverted ? "true" : "false");
+        if (useInverted) {
+            settings.setProperty(WebViewProperties.gfxInvertedScreenContrast,
+                    Float.toString(getInvertedContrast()));
+        }
 
-        settings.setProperty(WebViewProperties.gfxInvertedScreenContrast,
-                Float.toString(getInvertedContrast()));
-
-        settings.setProperty(WebViewProperties.gfxEnableCpuUploadPath,
-                enableCpuUploadPath() ? "true" : "false");
+        if (isDebugEnabled()) {
+            settings.setProperty(WebViewProperties.gfxEnableCpuUploadPath,
+                    enableCpuUploadPath() ? "true" : "false");
+        }
     }
 
     /**