summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlinuxx <joey@cyanogenmoditalia.it>2015-02-20 21:39:18 +0100
committerSteve Kondik <steve@cyngn.com>2015-11-07 13:57:35 -0800
commitcfc55f1967f309ab077eded9aa6afa542cd4f00a (patch)
tree08530a0a83c3803a403c2b5b1b7245a890afe801 /src
parent2fb3acbe27418b0d419227a87d75fbf8bdc8f9a1 (diff)
downloadpackages_apps_Browser-cfc55f1967f309ab077eded9aa6afa542cd4f00a.zip
packages_apps_Browser-cfc55f1967f309ab077eded9aa6afa542cd4f00a.tar.gz
packages_apps_Browser-cfc55f1967f309ab077eded9aa6afa542cd4f00a.tar.bz2
Browser: UI updates
-Vectors -New favourites (google, cyanogenmod, cyanogenmod wiki) Change-Id: I2c91f78192139e281618010722e678c0babcf46d Signed-off-by: linuxx <joey@cyanogenmoditalia.it>
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/provider/BrowserProvider.java37
1 files changed, 0 insertions, 37 deletions
diff --git a/src/com/android/browser/provider/BrowserProvider.java b/src/com/android/browser/provider/BrowserProvider.java
index 744032c..0b3ef94 100644
--- a/src/com/android/browser/provider/BrowserProvider.java
+++ b/src/com/android/browser/provider/BrowserProvider.java
@@ -61,9 +61,6 @@ public class BrowserProvider extends ContentProvider {
private static final String TAG = "BrowserProvider";
private static final String ORDER_BY = "visits DESC, date DESC";
- private static final String PICASA_URL = "http://picasaweb.google.com/m/" +
- "viewer?source=androidclient";
-
static final String[] TABLE_NAMES = new String[] {
"bookmarks", "searches"
};
@@ -405,44 +402,10 @@ public class BrowserProvider extends ContentProvider {
}
mOpenHelper = new DatabaseHelper(context);
mBackupManager = new BackupManager(context);
- // we added "picasa web album" into default bookmarks for version 19.
- // To avoid erasing the bookmark table, we added it explicitly for
- // version 18 and 19 as in the other cases, we will erase the table.
- if (DATABASE_VERSION == 18 || DATABASE_VERSION == 19) {
- SharedPreferences p = PreferenceManager
- .getDefaultSharedPreferences(context);
- boolean fix = p.getBoolean("fix_picasa", true);
- if (fix) {
- fixPicasaBookmark();
- Editor ed = p.edit();
- ed.putBoolean("fix_picasa", false);
- ed.apply();
- }
- }
mSettings = BrowserSettings.getInstance();
return true;
}
- private void fixPicasaBookmark() {
- SQLiteDatabase db = mOpenHelper.getWritableDatabase();
- Cursor cursor = db.rawQuery("SELECT _id FROM bookmarks WHERE " +
- "bookmark = 1 AND url = ?", new String[] { PICASA_URL });
- try {
- if (!cursor.moveToFirst()) {
- // set "created" so that it will be on the top of the list
- db.execSQL("INSERT INTO bookmarks (title, url, visits, " +
- "date, created, bookmark)" + " VALUES('" +
- getContext().getString(R.string.picasa) + "', '"
- + PICASA_URL + "', 0, 0, " + new Date().getTime()
- + ", 1);");
- }
- } finally {
- if (cursor != null) {
- cursor.close();
- }
- }
- }
-
/*
* Subclass AbstractCursor so we can combine multiple Cursors and add
* "Search the web".