summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/Controller.java
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2012-11-19 00:34:58 +0000
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2012-11-19 00:43:52 +0000
commit285eb1d81de6887ae4e7a8b725a7dd7038b6b231 (patch)
tree77821a6f00686a14817f444d31886824fdbd671f /src/com/android/browser/Controller.java
parentbf5e496dc1f5f69b6c24a03828e89849a5587235 (diff)
downloadpackages_apps_browser-285eb1d81de6887ae4e7a8b725a7dd7038b6b231.zip
packages_apps_browser-285eb1d81de6887ae4e7a8b725a7dd7038b6b231.tar.gz
packages_apps_browser-285eb1d81de6887ae4e7a8b725a7dd7038b6b231.tar.bz2
Revert "Multimedia feature port from ICS"
This reverts commit 9aa4a1b524d567c70967565bce2636f01c298d84.
Diffstat (limited to 'src/com/android/browser/Controller.java')
-rw-r--r--src/com/android/browser/Controller.java10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 2b449ec..77ceb95 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1,6 +1,5 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- * Copyright (c) 2011, 2012, Code Aurora Forum. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -834,15 +833,6 @@ public class Controller
view.setNetworkAvailable(false);
}
- WebSettings settings = view.getSettings();
- String preload = mSettings.getVideoPreloadEnabled();
- if (mSettings.getVideoPreloadAlwaysPreferenceString().equals(preload))
- settings.setMediaPreloadEnabled(true);
- else if (mSettings.getVideoPreloadOnWifiOnlyPreferenceString().equals(preload))
- settings.setMediaPreloadEnabled(mNetworkHandler.isWifiUp());
- else
- settings.setMediaPreloadEnabled(false);
-
// when BrowserActivity just starts, onPageStarted may be called before
// onResume as it is triggered from onCreate. Call resumeWebViewTimers
// to start the timer. As we won't switch tabs while an activity is in