Merge "Immediately update title bar when loading a URL"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d215724..d4d6467 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -498,8 +498,10 @@
<string name="pref_min_font_size">Minimum font size</string>
<!-- Label for the current minimum font size value [CHAR LIMIT=6] -->
<string name="pref_min_font_size_value"><xliff:g id="font_size">%d</xliff:g>pt</string>
- <!-- Label for text zoom (percent) [CHAR LIMIT=30] -->
- <string name="pref_text_zoom">Text zoom</string>
+ <!-- Label for text scaling (percent) [CHAR LIMIT=30] -->
+ <string name="pref_text_zoom">Text scaling</string>
+ <!-- Label for zoom on double-tap (percent) [CHAR LIMIT=30] -->
+ <string name="pref_zoom_on_double_tap">Zoom on double-tap</string>
<!-- Label for whether or not to force-enable user scalablity (aka, zoom) [CHAR LIMIT=30] -->
<string name="pref_force_userscalable">Force enable zoom</string>
<!-- Summary for whether or not to force-enable user scalablity (aka, zoom) [CHAR LIMIT=30] -->
@@ -625,7 +627,7 @@
<!-- Title for accessibility settings [CHAR LIMIT=25] -->
<string name="pref_accessibility_title">Accessibility</string>
<!-- Font size settings category under accessibility settings [CHAR LIMIT=50] -->
- <string name="pref_font_size_category">Font size</string>
+ <string name="pref_font_size_category">Text size</string>
<!-- Title for lab settings [CHAR LIMIT=25] -->
<string name="pref_lab_title">Labs</string>
<!-- Title for lab quick controls feature [CHAR LIMIT=40] -->
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index d9ad75c..282d4f2 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -336,8 +336,11 @@
// TabControl.restoreState() will create a new tab even if
// restoring the state fails.
setActiveTab(mTabControl.getCurrentTab());
- // Handle the intent
- mIntentHandler.onNewIntent(intent);
+ // Handle the intent if needed. If icicle != null, we are restoring
+ // and the intent will be stale - ignore it.
+ if (icicle == null) {
+ mIntentHandler.onNewIntent(intent);
+ }
}
// Read JavaScript flags if it exists.
String jsFlags = getSettings().getJsEngineFlags();
diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java
index cc6b57c..c76197d 100644
--- a/src/com/android/browser/IntentHandler.java
+++ b/src/com/android/browser/IntentHandler.java
@@ -65,7 +65,6 @@
}
void onNewIntent(Intent intent) {
- mActivity.setIntent(null);
Tab current = mTabControl.getCurrentTab();
// When a tab is closed on exit, the current tab index is set to -1.
// Reset before proceed as Browser requires the current tab to be set.