summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Add contentDescription for page info" into jb-mr1-devJohn Reck2012-09-211-0/+1
|\ \
| * | Add contentDescription for page infoJohn Reck2012-09-211-0/+1
| |/ | | | | | | | | | | Bug: 6806384 Change-Id: Ib009a345d2dcaf5630864e8087e12194d213e174
* | Merge "Add missing contentDescription" into jb-mr1-devJohn Reck2012-09-211-0/+1
|\ \
| * | Add missing contentDescriptionJohn Reck2012-09-211-0/+1
| |/ | | | | | | | | | | Bug: 6938839 Change-Id: I964ce0ffb47e9fcfb93f61edfc0e53c160d9e818
* | Add content description for folder upJohn Reck2012-09-211-0/+2
|/ | | | | | Bug: 6940202 Change-Id: I6b8c53285606fdcf6495a4ccf3c94a2037c8979b
* am 3d2e213c: Merge "Fix the issue the SQL request built by QuickSearchBox is ↵Jean-Baptiste Queru2012-08-282-2/+2
|\ | | | | | | | | | | | | not handled properly by Sqlite3." * commit '3d2e213ce176cb320ac52c71b00cb591beae8e04': Fix the issue the SQL request built by QuickSearchBox is not handled properly by Sqlite3.
| * Fix the issue the SQL request built by QuickSearchBox is not handled ↵Jean-Christophe PINCE2012-08-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * am eb2c7c2d: Import translations. DO NOT MERGEEric Fischer2012-06-122-2/+2
| |\ | | | | | | | | | | | | * commit 'eb2c7c2d3f4ddb0ebeab2a2d5537b208cf666db1': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEEric Fischer2012-06-112-2/+2
| | | | | | | | | | | | Change-Id: If82271af04a364d86f1734e0d5a3ee98639005f4
* | | Import translations. DO NOT MERGEYing Wang2012-07-251-1/+1
| | | | | | | | | | | | | | | Change-Id: If3bdd2026e323bb96bdede893c858d5bb79c3060 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-201-8/+8
| | | | | | | | | | | | | | | Change-Id: I953e470dccd90bdef407800bc8bcf795bfa4a848 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-191-2/+2
| | | | | | | | | | | | | | | Change-Id: I72bb2712652d3c37baa3eda17bf73833b81016a4 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-181-4/+4
| | | | | | | | | | | | | | | Change-Id: Ia7870b127edfb4c67181e04ad662ddc64f6878c0 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-161-29/+29
| | | | | | | | | | | | | | | Change-Id: Iac3c2627e2ecbe6b44c63776791124b14745c561 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-131-31/+31
| | | | | | | | | | | | | | | Change-Id: Ia13d11c2ddfabe406033768f7f55fe3e25de0ffb Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-121-14/+14
| | | | | | | | | | | | | | | Change-Id: Ibfd6c800f552edbfe50a2a98792884bee897a12e Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-06-201-1/+1
| | | | | | | | | | | | Change-Id: Ia1aaa4960cd30f6b5ab5cb7a8eb3f7b9be194684
* | | Import translations. DO NOT MERGEYing Wang2012-06-183-7/+7
| | | | | | | | | | | | Change-Id: I1620793215d53ea8303dcc4ce27c63d66dd22233
* | | Import translations. DO NOT MERGEEric Fischer2012-06-112-2/+2
| | | | | | | | | | | | Change-Id: I4bf9e7d24807658e20c687014501fa9aa18c0405
* | | Import translations. DO NOT MERGEEric Fischer2012-06-061-1/+1
| | | | | | | | | | | | Change-Id: I727ce7491f5483729517900a4fc4ae42eff525fa
* | | Import translations. DO NOT MERGEEric Fischer2012-06-051-2/+1
| | | | | | | | | | | | Change-Id: Iaceec026da21eeece8afc2fcb4df2a4ef4800d6b
* | | am 80f6d057: am 3c573ac4: Merge "Enable voice search in omnibox" into jb-devMichael Kolb2012-06-055-1/+17
|\ \ \ | |/ / | | | | | | | | | * commit '80f6d0574a9655fac3bd219afcb1810d0f66a57f': Enable voice search in omnibox
| * | am 3c573ac4: Merge "Enable voice search in omnibox" into jb-devMichael Kolb2012-06-045-1/+17
| |\ \ | | |/ | | | | | | | | | * commit '3c573ac4dbc0e9a117a9540c410911bab52dffa7': Enable voice search in omnibox
| | * Merge "Enable voice search in omnibox" into jb-devMichael Kolb2012-06-045-1/+17
| | |\
| | | * Enable voice search in omniboxMichael Kolb2012-06-045-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6601348 Bring back voice search. Also fixes focus bug for fixed titlebar. Change-Id: I83c8ad96957b62c23ad0bbb35685712687d11213
| * | | am 5a8a0f40: Import translations. DO NOT MERGEEric Fischer2012-06-041-3/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '5a8a0f40caf0d9e0e2e1b8689a8b8ec091569fcf': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEEric Fischer2012-06-041-3/+3
| | |/ | | | | | | | | | Change-Id: Ibf82f8bf961445d0745f5c222b263cb03f621e7c
* | | Import translations. DO NOT MERGEEric Fischer2012-06-043-7/+5
| | | | | | | | | | | | Change-Id: Ifb0c7ac9e94c1dbfd3673d23edf0e2006cb21ae4
* | | am 7aae2532: am 9d64d9a8: Merge "Fix seznam\'s suggest URL" into jb-devJohn Reck2012-06-031-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '7aae2532c247efc4bb815ff4962526120d24d5ad': Fix seznam's suggest URL
| * | am 9d64d9a8: Merge "Fix seznam\'s suggest URL" into jb-devJohn Reck2012-06-031-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '9d64d9a8016cc862296b20c4db545018373bdea5': Fix seznam's suggest URL
| | * Merge "Fix seznam's suggest URL" into jb-devJohn Reck2012-06-031-1/+1
| | |\
| | | * Fix seznam's suggest URLJohn Reck2012-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6578384 http:/// has one too many /'s Change-Id: I604d047872c910b8d71ac83d4c86cbdea17aba4b
| * | | am f4f58054: Import translations. DO NOT MERGEEric Fischer2012-06-011-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'f4f58054863590fd74ca618650a1c685e344ec70': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEEric Fischer2012-06-011-1/+1
| | |/ | | | | | | | | | Change-Id: If95d90dee051d663f80338d75ae5660cb1a3df80
| * | am 19276b6b: Import translations. DO NOT MERGEEric Fischer2012-05-311-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '19276b6b3ffe8864510b65ac6cad441c9b674fea': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEEric Fischer2012-05-311-1/+1
| | | | | | | | | | | | Change-Id: Ieebdab18b84d1705fed6a3af5f2d94ce70be727f
| * | am d6bea1eb: Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-05-302-16/+16
| |\ \ | | |/ | | | | | | | | | * commit 'd6bea1ebe54aac57625b9ae6784d677ce56eec83': Import translations. DO NOT MERGE
| | * Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-05-302-16/+16
| | |\
| | | * Import translations. DO NOT MERGEEric Fischer2012-05-302-16/+16
| | | | | | | | | | | | | | | | Change-Id: I9390d004cfae9d8836e459870daa98a144cb0a05
* | | | Import translations. DO NOT MERGEEric Fischer2012-06-0116-31/+16
| | | | | | | | | | | | | | | | Change-Id: Ib136e645574ce17d27d586bcd49c5848e955a442
* | | | Import translations. DO NOT MERGEEric Fischer2012-05-316-13/+7
| | | | | | | | | | | | | | | | Change-Id: Idfa14e2825477830d671bc978da73fdebd876428
* | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-05-3024-66/+43
|\ \ \ \
| * | | | Import translations. DO NOT MERGEEric Fischer2012-05-3024-66/+43
| | | | | | | | | | | | | | | | | | | | Change-Id: I273cb1f79fee61f9ed7f26482d007217b62edefc
* | | | | am 5f51df7f: am 06b7e0fa: Merge "tighten nav bar layout & fix animation bug" ↵Michael Kolb2012-05-301-9/+5
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | into jb-dev * commit '5f51df7f18e8fe9319b45eaf095511f7aa95aa44': tighten nav bar layout & fix animation bug
| * | | am 06b7e0fa: Merge "tighten nav bar layout & fix animation bug" into jb-devMichael Kolb2012-05-301-9/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '06b7e0fafdee08f7045f419b19eb1aacb00d7d60': tighten nav bar layout & fix animation bug
| | * | Merge "tighten nav bar layout & fix animation bug" into jb-devMichael Kolb2012-05-301-9/+5
| | |\ \ | | | |/ | | |/|
| | | * tighten nav bar layout & fix animation bugMichael Kolb2012-05-291-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6563289 Change-Id: I00fdecf645128bb1fec8e23be94aa2b85fb586f7
| * | | am 02e9618c: Import translations. DO NOT MERGEEric Fischer2012-05-292-4/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '02e9618ce3a54bc120697c05f9555c0a6a7ea502': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEEric Fischer2012-05-292-4/+4
| | |/ | | | | | | | | | Change-Id: Ib9b9f062988f60cb1c551068926e77a5c31dabc7
| * | am 070a0c79: Import translations. DO NOT MERGEEric Fischer2012-05-2549-29/+79
| |\ \ | | |/ | | | | | | | | | * commit '070a0c79c3c6498c2b05c9ad1f4c93b13c46382c': Import translations. DO NOT MERGE