Merge "Import revised translations."
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d7f2934..a5d40e4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -642,6 +642,10 @@
<!-- Summary for the fullscreen lab feature [CHAR LIMIT=120] -->
<string name="pref_lab_fullscreen_summary">
Use fullscreen mode to hide the status bar.</string>
+ <!-- Title for the inverted screen lab feature. This causes the screen to render with inverted colors (black becomes white and vice versa) [CHAR LIMIT=40] -->
+ <string name="pref_lab_inverted">Inverted Rendering</string>
+ <!-- Summary for the inverted screen lab feature. [CHAR LIMIT=120] -->
+ <string name="pref_lab_inverted_summary">Checking this causes the browser to invert colors. Black will become white and vice versa.</string>
<!-- Title for bandwidth management preference [CHAR LIMIT=25] -->
<string name="pref_data_title">Bandwidth Management</string>
<!-- Title for search preloading [CHAR LIMIT=40] -->
diff --git a/res/xml-sw600dp/lab_preferences.xml b/res/xml-sw600dp/lab_preferences.xml
index 1dbec88..512c8c1 100644
--- a/res/xml-sw600dp/lab_preferences.xml
+++ b/res/xml-sw600dp/lab_preferences.xml
@@ -16,17 +16,19 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android" >
-
<CheckBoxPreference
android:key="enable_quick_controls"
android:defaultValue="false"
android:title="@string/pref_lab_quick_controls"
android:summary="@string/pref_lab_quick_controls_summary" />
-
<CheckBoxPreference
android:key="use_instant_search"
android:defaultValue="false"
android:title="@string/pref_use_instant_search"
android:summary="@string/pref_use_instant_search_summary" />
-
+ <CheckBoxPreference
+ android:key="inverted"
+ android:defaultValue="false"
+ android:title="@string/pref_lab_inverted"
+ android:summary="@string/pref_lab_inverted_summary" />
</PreferenceScreen>
diff --git a/res/xml/lab_preferences.xml b/res/xml/lab_preferences.xml
index 3320cee..a3de6ca 100644
--- a/res/xml/lab_preferences.xml
+++ b/res/xml/lab_preferences.xml
@@ -26,4 +26,9 @@
android:defaultValue="false"
android:title="@string/pref_lab_fullscreen"
android:summary="@string/pref_lab_fullscreen_summary" />
+ <CheckBoxPreference
+ android:key="inverted"
+ android:defaultValue="false"
+ android:title="@string/pref_lab_inverted"
+ android:summary="@string/pref_lab_inverted_summary" />
</PreferenceScreen>
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 4d41426..dcc3269 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -205,6 +205,9 @@
} else {
settings.setUserAgentString(USER_AGENTS[getUserAgent()]);
}
+
+ settings.setProperty("gfxInvertedScreen",
+ useInvertedRendering() ? "true" : "false");
}
/**
@@ -674,6 +677,10 @@
return mPrefs.getBoolean(PREF_FULLSCREEN, false);
}
+ public boolean useInvertedRendering() {
+ return mPrefs.getBoolean(PREF_INVERTED, false);
+ }
+
// -----------------------------
// getter/setters for privacy_security_preferences.xml
// -----------------------------
diff --git a/src/com/android/browser/PreferenceKeys.java b/src/com/android/browser/PreferenceKeys.java
index 08ee91f..4174732 100644
--- a/src/com/android/browser/PreferenceKeys.java
+++ b/src/com/android/browser/PreferenceKeys.java
@@ -77,6 +77,7 @@
static final String PREF_ENABLE_QUICK_CONTROLS = "enable_quick_controls";
static final String PREF_USE_INSTANT_SEARCH = "use_instant_search";
static final String PREF_FULLSCREEN = "fullscreen";
+ static final String PREF_INVERTED = "inverted";
// ----------------------
// Keys for privacy_security_preferences.xml