summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorJean-Christophe PINCE <jean-christophe.pince@intel.com>2012-07-19 10:07:02 +0800
committerXiaokang Qin <xiaokang.qin@intel.com>2012-08-10 10:26:00 +0800
commit725365fe1021e63a784e9e1f0b71ba78eba6c164 (patch)
tree4637575b8b704afeca03c0e46fedc28173fbbaaa /res/xml
parent39e7dfee746d73670eea435024a80ae9dbedf176 (diff)
downloadpackages_apps_Browser-725365fe1021e63a784e9e1f0b71ba78eba6c164.zip
packages_apps_Browser-725365fe1021e63a784e9e1f0b71ba78eba6c164.tar.gz
packages_apps_Browser-725365fe1021e63a784e9e1f0b71ba78eba6c164.tar.bz2
Fix the issue the SQL request built by QuickSearchBox is not handled properly by Sqlite3.
SELECT history._id AS _id, history.url AS url, CASE WHEN bookmarks.title IS NOT NULL THEN bookmarks.title ELSE history.title END AS title, CASE WHEN bookmarks.url IS NOT NULL THEN "2130837532" ELSE "2130837548" END, history.date AS date FROM history LEFT OUTER JOIN bookmarks ON history.url = bookmarks.url WHERE (url LIKE ?) AND (deleted=0 AND folder=0) ORDER BY history.date DESC has to be replaced with: SELECT history._id AS _id, history.url AS url, CASE WHEN bookmarks.title IS NOT NULL THEN bookmarks.title ELSE history.title END AS title, CASE WHEN bookmarks.url IS NOT NULL THEN "2130837532" ELSE "2130837548" END, history.date AS date FROM history LEFT OUTER JOIN bookmarks ON history.url = bookmarks.url WHERE (bookmarks.url LIKE ?) AND (deleted=0 AND folder=0) ORDER BY history.date DESC Change-Id: Ib9fc03c2e102cca83c09168f75f2911a191af5ae Author: Jean-Christophe PINCE <jean-christophe.pince@intel.com> Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 43188
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/bookmarks_searchable.xml2
-rw-r--r--res/xml/searchable.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/res/xml/bookmarks_searchable.xml b/res/xml/bookmarks_searchable.xml
index de56add..8b83f26 100644
--- a/res/xml/bookmarks_searchable.xml
+++ b/res/xml/bookmarks_searchable.xml
@@ -25,6 +25,6 @@
android:searchSettingsDescription="@string/search_settings_description"
android:searchSuggestAuthority="browser"
android:searchSuggestPath="bookmarks"
- android:searchSuggestSelection="url LIKE ?"
+ android:searchSuggestSelection="bookmarks.url LIKE ?"
android:searchSuggestIntentAction="android.intent.action.VIEW"
/>
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index 3397a40..a06d5b0 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -27,6 +27,6 @@
android:inputType="textUri"
android:imeOptions="actionGo"
android:searchSuggestAuthority="browser"
- android:searchSuggestSelection="url LIKE ?"
+ android:searchSuggestSelection="history.url LIKE ?"
android:searchSuggestIntentAction="android.intent.action.VIEW"
/>