Merge "Revert "fix hl parameter for incognito search""
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 2eddd9a..cb026d8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -138,7 +138,7 @@
</string-array>
<string name="pref_content_open_in_background_summary" msgid="955411158407739504">"فتح علامات تبويب جديدة وراء علامة التبويب الحالية"</string>
<string name="pref_content_homepage" msgid="3324574611613105696">"تعيين الصفحة الرئيسية"</string>
- <string name="pref_content_search_engine" msgid="1620101310821644144">"تعين محرك بحث"</string>
+ <string name="pref_content_search_engine" msgid="1620101310821644144">"تعيين محرك بحث"</string>
<string name="pref_content_search_engine_summary" msgid="304003941861818133">"اختر محرك بحث"</string>
<string name="pref_set_homepage_to" msgid="7838684355145561242">"تعيين على"</string>
<string-array name="pref_homepage_choices">
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 787f1f1..2acfdf5 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -293,7 +293,7 @@
<string name="go_home" msgid="109129207276086793">"Domovská stránka"</string>
<string name="add_new_bookmark" msgid="3158497555612337238">"Přidat záložku"</string>
<string name="add_bookmark_short" msgid="3783984330998103735">"Přidat"</string>
- <string name="search_hint" msgid="4647356319916631820">"Vyhledávejte nebo zadejte adresu URL"</string>
+ <string name="search_hint" msgid="4647356319916631820">"Vyhledávejte či zadejte URL"</string>
<string name="search_button_text" msgid="5235226933877634410">"Přejít"</string>
<string name="search_settings_description" msgid="1422401062529014107">"Záložky a webová historie"</string>
<string name="popup_window_attempt" msgid="31565781154067629">"Umožnit tomuto webu otevřít vyskakovací okno?"</string>
@@ -322,7 +322,7 @@
<string name="webstorage_clear_data_dialog_cancel_button" msgid="2028867751958942762">"Zrušit"</string>
<string name="webstorage_origin_summary_mb_stored" msgid="1985885826292236210">"MB uloženo ve vašem telefonu"</string>
<string name="loading_video" msgid="7886324933131962321">"Načítání videa..."</string>
- <string name="geolocation_permissions_prompt_message" msgid="356796102004052471">"Web <xliff:g id="WEBSITE_ORIGIN">%s</xliff:g> požaduje informace o vaší poloze"</string>
+ <string name="geolocation_permissions_prompt_message" msgid="356796102004052471">"<xliff:g id="WEBSITE_ORIGIN">%s</xliff:g> žádá informace o vaší poloze"</string>
<string name="geolocation_permissions_prompt_share" msgid="9084486342048347976">"Sdílet polohu"</string>
<string name="geolocation_permissions_prompt_dont_share" msgid="6303025160237860300">"Odmítnout"</string>
<string name="geolocation_permissions_prompt_remember" msgid="3118526300707348308">"Zapamatovat předvolbu"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5a74b79..73f84bb 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -34,7 +34,7 @@
<string name="bookmarks_search" msgid="5229596268214362873">"Browser"</string>
<string name="cancel" msgid="3017274947407233702">"Annuller"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
- <string name="title_bar_loading" msgid="7438217780834640678">"Indlæser ..."</string>
+ <string name="title_bar_loading" msgid="7438217780834640678">"Indlæser..."</string>
<string name="page_info" msgid="4048529256302257195">"Sideoplysninger"</string>
<string name="page_info_view" msgid="5303490449842635158">"Vis sideoplysninger"</string>
<string name="page_info_address" msgid="2222306609532903254">"Adresse:"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 241e297..c73e78c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -185,7 +185,7 @@
<string name="autofill_setup_dialog_negative_toast" msgid="3288881675232206984">"Den AutoFill-Text können Sie jederzeit im Browser unter > \"Einstellungen\" > \"Allgemein\" einrichten."</string>
<string name="disable_autofill" msgid="8305901059849400354">"AutoFill deaktivieren"</string>
<string name="pref_privacy_security_title" msgid="3480313968942160914">"Datenschutz & Sicherheit"</string>
- <string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Cache löschen"</string>
+ <string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Cache leeren"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Inhalte und Datenbanken aus dem lokalen Cache löschen"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="4344512581716422465">"Inhalte und Datenbanken aus dem lokalen Cache löschen?"</string>
<string name="pref_privacy_cookies_title" msgid="6763274282214830526">"Cookies"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 07e9767..5c6355e 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -49,7 +49,7 @@
<string name="ssl_not_yet_valid" msgid="8193083327719048247">"Sertifikat ini belum valid."</string>
<string name="ssl_date_invalid" msgid="3705563379257285534">"Tanggal sertifikat ini tidak valid."</string>
<string name="ssl_invalid" msgid="9041704741505449967">"Sertifikat ini tidak valid."</string>
- <string name="ssl_unknown" msgid="5679243486524754571">"Galat sertifikat tak dikenal."</string>
+ <string name="ssl_unknown" msgid="5679243486524754571">"Kesalahan sertifikat tak dikenal."</string>
<string name="stopping" msgid="4839698519340302982">"Menghentikan"</string>
<string name="stop" msgid="5687251076030630074">"Berhenti"</string>
<string name="reload" msgid="8585220783228408062">"Segarkan"</string>
@@ -189,9 +189,9 @@
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Hapus konten dan basis data yang disimpan dalam tembolok secara lokal"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="4344512581716422465">"Hapus basis data dan konten dalam tembolok lokal?"</string>
<string name="pref_privacy_cookies_title" msgid="6763274282214830526">"Kuki"</string>
- <string name="pref_privacy_clear_cookies" msgid="3095583579133780331">"Hapus semua data kuki"</string>
- <string name="pref_privacy_clear_cookies_summary" msgid="6962742063990677520">"Menghapus semua kuki browser"</string>
- <string name="pref_privacy_clear_cookies_dlg" msgid="1493252163164621278">"Hapus semua kuki?"</string>
+ <string name="pref_privacy_clear_cookies" msgid="3095583579133780331">"Hapus semua data cookie"</string>
+ <string name="pref_privacy_clear_cookies_summary" msgid="6962742063990677520">"Menghapus semua cookie browser"</string>
+ <string name="pref_privacy_clear_cookies_dlg" msgid="1493252163164621278">"Hapus semua cookie?"</string>
<string name="pref_privacy_clear_history" msgid="8723795508825198477">"Hapus riwayat"</string>
<string name="pref_privacy_clear_history_summary" msgid="6868501330708940734">"Hapus riwayat navigasi browser"</string>
<string name="pref_privacy_clear_history_dlg" msgid="6934317391642846227">"Hapus riwayat navigasi browser?"</string>
@@ -215,8 +215,8 @@
<string name="pref_security_save_form_data_summary" msgid="4994074685153708026">"Ingat data yang saya ketik untuk digunakan lagi nanti"</string>
<string name="pref_security_show_security_warning" msgid="8901135676266754559">"Tampilkan peringatan keamanan"</string>
<string name="pref_security_show_security_warning_summary" msgid="5260098316025397525">"Tampilkan peringatan jika ada masalah dengan keamanan situs"</string>
- <string name="pref_security_accept_cookies" msgid="3201367661925047989">"Terima kuki"</string>
- <string name="pref_security_accept_cookies_summary" msgid="1907951236154433751">"Izinkan situs menyimpan dan membaca data kuki"</string>
+ <string name="pref_security_accept_cookies" msgid="3201367661925047989">"Terima cookie"</string>
+ <string name="pref_security_accept_cookies_summary" msgid="1907951236154433751">"Izinkan situs menyimpan dan membaca data cookie"</string>
<string-array name="pref_text_size_choices">
<item msgid="4952686548944739548">"Kecil"</item>
<item msgid="1950030433642671460">"Kecil"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5d1129c..7ae6c9d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -267,7 +267,7 @@
<string name="pref_font_size_category" msgid="6683754355084218254">"文字大小"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"实验室"</string>
<string name="pref_lab_quick_controls" msgid="3267606522082281367">"快速控制"</string>
- <string name="pref_lab_quick_controls_summary" msgid="3149664132600968775">"从左侧或右侧边缘滑动拇指可打开快速控件并隐藏应用程序和网址栏"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="3149664132600968775">"从左侧或右侧边缘滑动拇指可打开快速控件并隐藏应用和网址栏"</string>
<string name="pref_use_instant_search" msgid="1119176077760723740">"Google 即搜即得"</string>
<string name="pref_use_instant_search_summary" msgid="839320474961917522">"借助 Google 即搜即得，您可以在使用 Google 搜索时一边键入内容一边查看结果（此功能可能会增加数据使用量）。"</string>
<string name="pref_lab_fullscreen" msgid="8173609016657987973">"全屏"</string>
diff --git a/src/com/android/browser/preferences/FontSizePreview.java b/src/com/android/browser/preferences/FontSizePreview.java
index 91ecb00..8825f3d 100644
--- a/src/com/android/browser/preferences/FontSizePreview.java
+++ b/src/com/android/browser/preferences/FontSizePreview.java
@@ -54,7 +54,7 @@
}
@Override
- protected void updatePreview() {
+ protected void updatePreview(boolean forceReload) {
if (mWebView == null) return;
WebSettings ws = mWebView.getSettings();
diff --git a/src/com/android/browser/preferences/InvertedContrastPreview.java b/src/com/android/browser/preferences/InvertedContrastPreview.java
index ba00421..ed6eadf 100644
--- a/src/com/android/browser/preferences/InvertedContrastPreview.java
+++ b/src/com/android/browser/preferences/InvertedContrastPreview.java
@@ -74,7 +74,7 @@
}
@Override
- protected void updatePreview() {
+ protected void updatePreview(boolean forceReload) {
if (mWebView == null) return;
WebSettingsClassic ws = WebViewClassic.fromWebView(mWebView).getSettings();
@@ -83,7 +83,9 @@
bs.useInvertedRendering() ? "true" : "false");
ws.setProperty(WebViewProperties.gfxInvertedScreenContrast,
Float.toString(bs.getInvertedContrast()));
- mWebView.loadData(mHtml, "text/html", null);
+ if (forceReload) {
+ mWebView.loadData(mHtml, "text/html", null);
+ }
}
}
diff --git a/src/com/android/browser/preferences/WebViewPreview.java b/src/com/android/browser/preferences/WebViewPreview.java
index a3c19a4..1f938f0 100644
--- a/src/com/android/browser/preferences/WebViewPreview.java
+++ b/src/com/android/browser/preferences/WebViewPreview.java
@@ -53,7 +53,7 @@
setLayoutResource(R.layout.webview_preview);
}
- protected abstract void updatePreview();
+ protected abstract void updatePreview(boolean forceReload);
protected void setupWebView(WebView view) {}
@@ -77,7 +77,7 @@
protected void onBindView(View view) {
super.onBindView(view);
mWebView = (WebView) view.findViewById(R.id.webview);
- updatePreview();
+ updatePreview(true);
}
@Override
@@ -95,7 +95,7 @@
@Override
public void onSharedPreferenceChanged(
SharedPreferences sharedPreferences, String key) {
- updatePreview();
+ updatePreview(false);
}
}
diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index 8d71266..6121abc 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -386,6 +386,7 @@
static final int DATABASE_VERSION = 32;
public DatabaseHelper(Context context) {
super(context, DATABASE_NAME, null, DATABASE_VERSION);
+ setWriteAheadLoggingEnabled(true);
}
@Override
@@ -624,7 +625,6 @@
}
public void onOpen(SQLiteDatabase db) {
- db.enableWriteAheadLogging();
mSyncHelper.onDatabaseOpened(db);
}