Merge "Prevent WebViewPreview from scrolling"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 77e25a3..9bf1dcb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -656,6 +656,7 @@
<string name="pref_data_preload_value_never" translatable="false">NEVER</string>
<string name="pref_data_preload_value_wifi_only" translatable="false">WIFI_ONLY</string>
<string name="pref_data_preload_value_always" translatable="false">ALWAYS</string>
+ <string name="pref_data_preload_default_value" translatable="false">@string/pref_data_preload_value_always</string>
<string-array name="pref_data_preload_values" translatable="false">
<item><xliff:g>@string/pref_data_preload_value_never</xliff:g></item>
<item><xliff:g>@string/pref_data_preload_value_wifi_only</xliff:g></item>
diff --git a/res/xml/bandwidth_preferences.xml b/res/xml/bandwidth_preferences.xml
index 8a31304..f294026 100644
--- a/res/xml/bandwidth_preferences.xml
+++ b/res/xml/bandwidth_preferences.xml
@@ -20,7 +20,7 @@
android:key="preload_when"
android:title="@string/pref_data_preload_title"
android:summary="@string/pref_data_preload_summary"
- android:defaultValue="@string/pref_data_preload_value_wifi_only"
+ android:defaultValue="@string/pref_data_preload_default_value"
android:entries="@array/pref_data_preload_choices"
android:entryValues="@array/pref_data_preload_values"
android:dialogTitle="@string/pref_data_preload_dialogtitle" />
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index ce8a9c1..6b8daec 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -789,7 +789,7 @@
}
private String getDefaultPreloadSetting() {
- return getPreloadOnWifiOnlyPreferenceString(mContext);
+ return mContext.getResources().getString(R.string.pref_data_preload_default_value);
}
public String getPreloadEnabled() {
diff --git a/src/com/android/browser/NavigationBarTablet.java b/src/com/android/browser/NavigationBarTablet.java
index 661ed71..c22b1a0 100644
--- a/src/com/android/browser/NavigationBarTablet.java
+++ b/src/com/android/browser/NavigationBarTablet.java
@@ -249,6 +249,7 @@
}
private void stopOrRefresh() {
+ if (mUiController == null) return;
if (mTitleBar.isInLoad()) {
mUiController.stopLoading();
} else {
diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java
index e1511b9..ca3754c 100644
--- a/src/com/android/browser/SuggestionsAdapter.java
+++ b/src/com/android/browser/SuggestionsAdapter.java
@@ -479,8 +479,6 @@
Uri.Builder ub = OmniboxSuggestions.CONTENT_URI.buildUpon();
ub.appendQueryParameter(BrowserContract.PARAM_LIMIT,
Integer.toString(Math.max(mLinesLandscape, mLinesPortrait)));
- ub.appendQueryParameter(BrowserProvider2.PARAM_GROUP_BY,
- OmniboxSuggestions.URL);
mCursor =
mContext.getContentResolver().query(ub.build(), COMBINED_PROJECTION,
selection, (constraint != null) ? args : null, null);
diff --git a/tests/src/com/android/browser/JNIBindingsTest.java b/tests/src/com/android/browser/JNIBindingsTest.java
index 8c25a80..ae694c9 100644
--- a/tests/src/com/android/browser/JNIBindingsTest.java
+++ b/tests/src/com/android/browser/JNIBindingsTest.java
@@ -213,8 +213,7 @@
public boolean testJSPrimitivesToStringsInJava(String intParam, String nullParam,
String doubleParam, String booleanParam, String charParam,
String undefinedParam) {
- // Since JS numbers are treated as doubles.
- String expectedIntParam = "123.0";
+ String expectedIntParam = "123";
String expectedDoubleParam = "456.789";
String expectedBooleanParam = "true";
String expectedCharParam = "d";