diff options
| author | Andrei Popescu <andreip@google.com> | 2009-07-21 18:24:06 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-07-21 18:24:06 +0100 |
| commit | 824faebe51bae769395ec1d7f590530df94b58d3 (patch) | |
| tree | 8d14ed7965cd9b302dd3aae9a935c0bf29a687ae /src/com/android | |
| parent | 3b3bf30ac65921a8627fb25c4ea05316b8e1ba98 (diff) | |
| download | packages_apps_Browser-824faebe51bae769395ec1d7f590530df94b58d3.zip packages_apps_Browser-824faebe51bae769395ec1d7f590530df94b58d3.tar.gz packages_apps_Browser-824faebe51bae769395ec1d7f590530df94b58d3.tar.bz2 | |
wire appcache to HTML5 UI
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/browser/BrowserPreferencesPage.java | 3 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserSettings.java | 2 | ||||
| -rw-r--r-- | src/com/android/browser/WebsiteSettingsActivity.java | 7 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java index 2524eb8..4536b2c 100644 --- a/src/com/android/browser/BrowserPreferencesPage.java +++ b/src/com/android/browser/BrowserPreferencesPage.java @@ -18,6 +18,7 @@ package com.android.browser; import java.util.List; import java.util.Vector; +import java.util.Set; import android.content.Intent; import android.net.Uri; @@ -93,7 +94,7 @@ public class BrowserPreferencesPage extends PreferenceActivity PreferenceScreen manageDatabases = (PreferenceScreen) findPreference(BrowserSettings.PREF_WEBSITE_SETTINGS); manageDatabases.setEnabled(false); - Vector origins = WebStorage.getInstance().getOrigins(); + Set origins = WebStorage.getInstance().getOrigins(); if ((origins != null) && (origins.size() > 0)) { manageDatabases.setEnabled(true); } diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index 479c0a3..2301289 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -510,7 +510,7 @@ class BrowserSettings extends Observable { } /*package*/ void clearDatabases(Context context) { - WebStorage.getInstance().deleteAllDatabases(); + WebStorage.getInstance().deleteAllData(); // Remove all listed databases from the preferences PreferenceActivity activity = (PreferenceActivity) context; PreferenceScreen screen = (PreferenceScreen) diff --git a/src/com/android/browser/WebsiteSettingsActivity.java b/src/com/android/browser/WebsiteSettingsActivity.java index 7fea766..c9042cd 100644 --- a/src/com/android/browser/WebsiteSettingsActivity.java +++ b/src/com/android/browser/WebsiteSettingsActivity.java @@ -108,10 +108,11 @@ public class WebsiteSettingsActivity extends ListActivity { // Get the list of origins we want to display HashMap<String, Site> uris = new HashMap<String, Site>(); - Vector origins = WebStorage.getInstance().getOrigins(); + Set origins = WebStorage.getInstance().getOrigins(); if (origins != null) { - for (int i = 0; i < origins.size(); i++) { - String origin = (String) origins.get(i); + Iterator<String> iter = origins.iterator(); + while (iter.hasNext()) { + String origin = iter.next(); Site site = new Site(origin, origin, null); uris.put(Uri.parse(origin).getHost(), site); } |