diff options
Diffstat (limited to 'src/com/android')
6 files changed, 15 insertions, 18 deletions
diff --git a/src/com/android/browser/BookmarkUtils.java b/src/com/android/browser/BookmarkUtils.java index ca0cfbc..4834c39 100644 --- a/src/com/android/browser/BookmarkUtils.java +++ b/src/com/android/browser/BookmarkUtils.java @@ -234,7 +234,6 @@ public class BookmarkUtils { final Context context, final Message msg) { new AlertDialog.Builder(context) - .setTitle(R.string.delete_bookmark) .setIcon(android.R.drawable.ic_dialog_alert) .setMessage(context.getString(R.string.delete_bookmark_warning, title)) diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java index 8461d77..69febc5 100644 --- a/src/com/android/browser/BrowserHistoryPage.java +++ b/src/com/android/browser/BrowserHistoryPage.java @@ -292,7 +292,6 @@ public class BrowserHistoryPage extends Fragment final ContentResolver resolver = getActivity().getContentResolver(); final ClearHistoryTask clear = new ClearHistoryTask(resolver); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()) - .setTitle(R.string.clear) .setMessage(R.string.pref_privacy_clear_history_dlg) .setIcon(android.R.drawable.ic_dialog_alert) .setNegativeButton(R.string.cancel, null) diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index f92e53b..e2a521a 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -271,14 +271,18 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, settings.setUserAgentString(USER_AGENTS[getUserAgent()]); } + boolean useInverted = useInvertedRendering(); settings.setProperty(WebViewProperties.gfxInvertedScreen, - useInvertedRendering() ? "true" : "false"); - - settings.setProperty(WebViewProperties.gfxInvertedScreenContrast, - Float.toString(getInvertedContrast())); + useInverted ? "true" : "false"); + if (useInverted) { + settings.setProperty(WebViewProperties.gfxInvertedScreenContrast, + Float.toString(getInvertedContrast())); + } - settings.setProperty(WebViewProperties.gfxEnableCpuUploadPath, - enableCpuUploadPath() ? "true" : "false"); + if (isDebugEnabled()) { + settings.setProperty(WebViewProperties.gfxEnableCpuUploadPath, + enableCpuUploadPath() ? "true" : "false"); + } } /** diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java index e948d01..8a3febe 100644 --- a/src/com/android/browser/Tab.java +++ b/src/com/android/browser/Tab.java @@ -685,12 +685,12 @@ class Tab implements PictureListener { errorCode != WebViewClient.ERROR_UNSUPPORTED_SCHEME && errorCode != WebViewClient.ERROR_FILE) { queueError(errorCode, description); - } - // Don't log URLs when in private browsing mode - if (!isPrivateBrowsingEnabled()) { - Log.e(LOGTAG, "onReceivedError " + errorCode + " " + failingUrl + // Don't log URLs when in private browsing mode + if (!isPrivateBrowsingEnabled()) { + Log.e(LOGTAG, "onReceivedError " + errorCode + " " + failingUrl + " " + description); + } } } @@ -1014,7 +1014,6 @@ class Tab implements PictureListener { // Build a confirmation dialog to display to the user. final AlertDialog d = new AlertDialog.Builder(mContext) - .setTitle(R.string.attention) .setIcon(android.R.drawable.ic_dialog_alert) .setMessage(R.string.popup_window_attempt) .setPositiveButton(R.string.allow, allowListener) @@ -1266,7 +1265,6 @@ class Tab implements PictureListener { final View layout = inflater.inflate(R.layout.setup_autofill_dialog, null); builder.setView(layout) - .setTitle(R.string.autofill_setup_dialog_title) .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { diff --git a/src/com/android/browser/preferences/InvertedContrastPreview.java b/src/com/android/browser/preferences/InvertedContrastPreview.java index a2d2910..c290daf 100644 --- a/src/com/android/browser/preferences/InvertedContrastPreview.java +++ b/src/com/android/browser/preferences/InvertedContrastPreview.java @@ -82,7 +82,7 @@ public class InvertedContrastPreview extends WebViewPreview { bs.useInvertedRendering() ? "true" : "false"); ws.setProperty(WebViewProperties.gfxInvertedScreenContrast, Float.toString(bs.getInvertedContrast())); - mWebView.loadData(mHtml, "text/html", "utf-8"); + mWebView.loadData(mHtml, "text/html", null); } } diff --git a/src/com/android/browser/preferences/WebsiteSettingsFragment.java b/src/com/android/browser/preferences/WebsiteSettingsFragment.java index 91c66a0..92cc62f 100644 --- a/src/com/android/browser/preferences/WebsiteSettingsFragment.java +++ b/src/com/android/browser/preferences/WebsiteSettingsFragment.java @@ -581,7 +581,6 @@ public class WebsiteSettingsFragment extends ListFragment implements OnClickList switch (mCurrentSite.getFeatureByIndex(position)) { case Site.FEATURE_WEB_STORAGE: new AlertDialog.Builder(getContext()) - .setTitle(R.string.webstorage_clear_data_dialog_title) .setMessage(R.string.webstorage_clear_data_dialog_message) .setPositiveButton(R.string.webstorage_clear_data_dialog_ok_button, new AlertDialog.OnClickListener() { @@ -602,7 +601,6 @@ public class WebsiteSettingsFragment extends ListFragment implements OnClickList break; case Site.FEATURE_GEOLOCATION: new AlertDialog.Builder(getContext()) - .setTitle(R.string.geolocation_settings_page_dialog_title) .setMessage(R.string.geolocation_settings_page_dialog_message) .setPositiveButton(R.string.geolocation_settings_page_dialog_ok_button, new AlertDialog.OnClickListener() { @@ -686,7 +684,6 @@ public class WebsiteSettingsFragment extends ListFragment implements OnClickList case R.id.clear_all_button: // Show the prompt to clear all origins of their data and geolocation permissions. new AlertDialog.Builder(getActivity()) - .setTitle(R.string.website_settings_clear_all_dialog_title) .setMessage(R.string.website_settings_clear_all_dialog_message) .setPositiveButton(R.string.website_settings_clear_all_dialog_ok_button, new AlertDialog.OnClickListener() { |