Merge "fix shortcut handling"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 80cb2c8..b61385a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -573,6 +573,8 @@
<!-- Do not tranlsate. Development option -->
<string name="pref_development_hardware_accel" translatable="false">Enable OpenGL Rendering</string>
<!-- Do not tranlsate. Development option -->
+ <string name="pref_development_visual_indicator" translatable="false">Enable Visual Indicator</string>
+ <!-- Do not tranlsate. Development option -->
<string name="js_engine_flags" translatable="false">Set JS flags</string>
<!-- Do not tranlsate. Development option -->
<string name="pref_development_uastring" translatable="false">UAString</string>
diff --git a/res/xml/hidden_debug_preferences.xml b/res/xml/hidden_debug_preferences.xml
index 6d66eaa..661d9de 100644
--- a/res/xml/hidden_debug_preferences.xml
+++ b/res/xml/hidden_debug_preferences.xml
@@ -20,6 +20,11 @@
<!-- The javascript console is enabled by default when the user has
also enabled debug mode by navigating to about:debug. -->
<CheckBoxPreference
+ android:key="enable_visual_indicator"
+ android:defaultValue="false"
+ android:title="@string/pref_development_visual_indicator" />
+
+ <CheckBoxPreference
android:key="javascript_console"
android:defaultValue="true"
android:title="@string/pref_development_error_console" />
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index faf0042..f3bc48a 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -109,7 +109,7 @@
private boolean lightTouch = false;
private boolean navDump = false;
private boolean hardwareAccelerated = true;
-
+ private boolean showVisualIndicator = false;
// Lab settings
private boolean quickControls = false;
private boolean useMostVisitedHomepage = false;
@@ -162,6 +162,7 @@
public final static String PREF_AUTOFILL_PROFILE = "autofill_profile";
public final static String PREF_AUTOFILL_ACTIVE_PROFILE_ID = "autofill_active_profile_id";
public final static String PREF_HARDWARE_ACCEL = "enable_hardware_accel";
+ public final static String PREF_VISUAL_INDICATOR = "enable_visual_indicator";
public final static String PREF_USER_AGENT = "user_agent";
public final static String PREF_QUICK_CONTROLS = "enable_quick_controls";
@@ -251,6 +252,7 @@
s.setUseWideViewPort(b.useWideViewPort);
s.setLoadsImagesAutomatically(b.loadsImagesAutomatically);
s.setJavaScriptEnabled(b.javaScriptEnabled);
+ s.setShowVisualIndicator(b.showVisualIndicator);
s.setPluginState(b.pluginState);
s.setJavaScriptCanOpenWindowsAutomatically(
b.javaScriptCanOpenWindowsAutomatically);
@@ -493,6 +495,7 @@
tracing = p.getBoolean("enable_tracing", tracing);
lightTouch = p.getBoolean("enable_light_touch", lightTouch);
navDump = p.getBoolean("enable_nav_dump", navDump);
+ showVisualIndicator = p.getBoolean(PREF_VISUAL_INDICATOR, showVisualIndicator);
}
quickControls = p.getBoolean(PREF_QUICK_CONTROLS, quickControls);
@@ -589,6 +592,10 @@
return hardwareAccelerated;
}
+ public boolean showVisualIndicator() {
+ return showVisualIndicator;
+ }
+
public boolean useQuickControls() {
return quickControls;
}
@@ -886,6 +893,8 @@
SharedPreferences p, String key) {
if (PREF_HARDWARE_ACCEL.equals(key)) {
hardwareAccelerated = p.getBoolean(PREF_HARDWARE_ACCEL, hardwareAccelerated);
+ } else if (PREF_VISUAL_INDICATOR.equals(key)) {
+ showVisualIndicator = p.getBoolean(PREF_VISUAL_INDICATOR, showVisualIndicator);
} else if (PREF_USER_AGENT.equals(key)) {
userAgent = Integer.parseInt(p.getString(PREF_USER_AGENT, "0"));
update();