diff options
author | Jonathan Dixon <joth@google.com> | 2013-08-25 19:35:27 -0700 |
---|---|---|
committer | Jonathan Dixon <joth@google.com> | 2013-08-25 20:07:02 -0700 |
commit | f9e1705d4012706664a2bdf63a50b8a784b833dd (patch) | |
tree | 9cf92ff971c6cd8124391da966f208db2f588baa /src/com/android/browser/preferences | |
parent | 56b5495f6761d5800918682a5b6bdd282019f14b (diff) | |
download | packages_apps_Browser-f9e1705d4012706664a2bdf63a50b8a784b833dd.zip packages_apps_Browser-f9e1705d4012706664a2bdf63a50b8a784b833dd.tar.gz packages_apps_Browser-f9e1705d4012706664a2bdf63a50b8a784b833dd.tar.bz2 |
De-classicify Android Browser part 2
Bug: 10427705
Allows Browser to compile even when WebViewClassic is no longer in
frameworks/base. The deleted functionality was already disabled at
runtime when using non-classic webview.
Change-Id: I21b58ec52ac059c699b49a2dd80008d9a9e6791a
Diffstat (limited to 'src/com/android/browser/preferences')
-rw-r--r-- | src/com/android/browser/preferences/GeneralPreferencesFragment.java | 13 | ||||
-rw-r--r-- | src/com/android/browser/preferences/InvertedContrastPreview.java | 13 |
2 files changed, 0 insertions, 26 deletions
diff --git a/src/com/android/browser/preferences/GeneralPreferencesFragment.java b/src/com/android/browser/preferences/GeneralPreferencesFragment.java index c018474..26fb05f 100644 --- a/src/com/android/browser/preferences/GeneralPreferencesFragment.java +++ b/src/com/android/browser/preferences/GeneralPreferencesFragment.java @@ -198,17 +198,4 @@ public class GeneralPreferencesFragment extends PreferenceFragment } return null; } - - @Override - public void onResume() { - super.onResume(); - - refreshUi(); - } - - void refreshUi() { - PreferenceScreen autoFillSettings = - (PreferenceScreen)findPreference(PreferenceKeys.PREF_AUTOFILL_PROFILE); - autoFillSettings.setDependency(PreferenceKeys.PREF_AUTOFILL_ENABLED); - } } diff --git a/src/com/android/browser/preferences/InvertedContrastPreview.java b/src/com/android/browser/preferences/InvertedContrastPreview.java index 2b8ad47..988f64a 100644 --- a/src/com/android/browser/preferences/InvertedContrastPreview.java +++ b/src/com/android/browser/preferences/InvertedContrastPreview.java @@ -19,8 +19,6 @@ package com.android.browser.preferences; import android.content.Context; import android.text.TextUtils; import android.util.AttributeSet; -import android.webkit.WebSettingsClassic; -import android.webkit.WebViewClassic; import com.android.browser.BrowserSettings; import com.android.browser.BrowserWebView; @@ -76,17 +74,6 @@ public class InvertedContrastPreview extends WebViewPreview { @Override protected void updatePreview(boolean forceReload) { - if (mWebView == null || !BrowserWebView.isClassic()) return; - - WebSettingsClassic ws = WebViewClassic.fromWebView(mWebView).getSettings(); - BrowserSettings bs = BrowserSettings.getInstance(); - ws.setProperty(WebViewProperties.gfxInvertedScreen, - bs.useInvertedRendering() ? "true" : "false"); - ws.setProperty(WebViewProperties.gfxInvertedScreenContrast, - Float.toString(bs.getInvertedContrast())); - if (forceReload) { - mWebView.loadData(mHtml, "text/html", null); - } } } |