summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 62c60330: Import revised translations. DO NOT MERGEEric Fischer2010-09-2420-2/+42
|\ | | | | | | | | | | | | Merge commit '62c60330637330e342e6721768f920366e42d59d' into gingerbread-plus-aosp * commit '62c60330637330e342e6721768f920366e42d59d': Import revised translations. DO NOT MERGE
| * Import revised translations. DO NOT MERGEEric Fischer2010-09-2420-2/+42
| | | | | | | | Change-Id: I641b4472e0d865c5d8ac8f2bf6409d92c9e09b87
* | am e5823b2c: am eb8fc4a0: (-s ours) Import translations for search engine ↵Eric Fischer2010-09-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | setting. DO NOT MERGE Merge commit 'e5823b2c43f0910dcdea7163a28adf56c6928231' into gingerbread-plus-aosp * commit 'e5823b2c43f0910dcdea7163a28adf56c6928231': Import translations for search engine setting. DO NOT MERGE
| * am eb8fc4a0: (-s ours) Import translations for search engine setting. DO ↵Eric Fischer2010-09-210-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE Merge commit 'eb8fc4a0afa7d7bee3a03d63f62ab24c0a75b99f' into gingerbread * commit 'eb8fc4a0afa7d7bee3a03d63f62ab24c0a75b99f': Import translations for search engine setting. DO NOT MERGE
| | * Import translations for search engine setting. DO NOT MERGEEric Fischer2010-09-2120-59/+39
| | | | | | | | | | | | Change-Id: Ib28adb628b31d2832ab1b12d9564931770ff9d6f
* | | am 5feb8ad0: Do not merge: Don\'t show cab when invoking select text from menuCary Clark2010-09-211-2/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '5feb8ad06b1000aec9403209b10b5d5210b2e241' into gingerbread-plus-aosp * commit '5feb8ad06b1000aec9403209b10b5d5210b2e241': Do not merge: Don't show cab when invoking select text from menu
| * | Do not merge: Don't show cab when invoking select text from menuCary Clark2010-09-211-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Leave the experiment intact for posterity. Also, remove spurious comment. Change-Id: I44519d4cf6843acf9aa056a6452e0e34216f2968 http://b/2626451
* | | am 1da09d51: am 196bc63b: (-s ours) Use translation from donut for "Set ↵Eric Fischer2010-09-200-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | search engine." DO NOT MERGE Merge commit '1da09d51a50843a5a445b7c92f3742f67da99ae6' into gingerbread-plus-aosp * commit '1da09d51a50843a5a445b7c92f3742f67da99ae6': Use translation from donut for "Set search engine." DO NOT MERGE
| * | am 196bc63b: (-s ours) Use translation from donut for "Set search engine." ↵Eric Fischer2010-09-200-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Merge commit '196bc63b92bec578e351445348fcb66071673b8a' into gingerbread * commit '196bc63b92bec578e351445348fcb66071673b8a': Use translation from donut for "Set search engine." DO NOT MERGE
| | * Use translation from donut for "Set search engine." DO NOT MERGEEric Fischer2010-09-2021-1/+61
| | | | | | | | | | | | Change-Id: I4c3ea599954d128208d349209469b2cedfb331e2
* | | am 24727f19: am 8774c667: Remove "Show web suggestions" from browser settingsLeon Scroggins III2010-09-174-48/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '24727f19f0c01b6b3106fc0383d262a72f4487df' into gingerbread-plus-aosp * commit '24727f19f0c01b6b3106fc0383d262a72f4487df': Remove "Show web suggestions" from browser settings
| * | am 8774c667: Remove "Show web suggestions" from browser settingsLeon Scroggins III2010-09-174-48/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '8774c667dd446346dca5f5d3c89092fbc86448d0' into gingerbread * commit '8774c667dd446346dca5f5d3c89092fbc86448d0': Remove "Show web suggestions" from browser settings
| | * Remove "Show web suggestions" from browser settingsLeon Scroggins III2010-09-174-48/+0
| | | | | | | | | | | | | | | Bug:3011374 Change-Id: I44d57431d127e48d25a957915a2fb93dc96b1053
* | | am 06e1dcac: am 3130660e: Default to Google if global search provider not ↵Leon Scroggins III2010-09-171-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | present. Merge commit '06e1dcacbeeadc87a2b4d9fb2ca12d9c7f7fbea2' into gingerbread-plus-aosp * commit '06e1dcacbeeadc87a2b4d9fb2ca12d9c7f7fbea2': Default to Google if global search provider not present.
| * | am 3130660e: Default to Google if global search provider not present.Leon Scroggins III2010-09-171-1/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '3130660e0045923199c74efa7c1df9ea85501dce' into gingerbread * commit '3130660e0045923199c74efa7c1df9ea85501dce': Default to Google if global search provider not present.
| | * Default to Google if global search provider not present.Leon Scroggins III2010-09-171-1/+2
| | | | | | | | | | | | | | | Bug: 3009486 Change-Id: I9d727b5f6d478483814e420aca7ad30dcf5252f5
* | | am a9e35b6e: Prevent a null pointer exception.Leon Scroggins III2010-09-171-2/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'a9e35b6e3101fafb07e6bb4282e7dfc4dcfdc193' into gingerbread-plus-aosp * commit 'a9e35b6e3101fafb07e6bb4282e7dfc4dcfdc193': Prevent a null pointer exception.
| * | Prevent a null pointer exception.Leon Scroggins III2010-09-161-2/+6
| | | | | | | | | | | | | | | Bug: 3004709 Change-Id: I0594f8725601cf0e99dd2809d3571af6bfe1a056
* | | am 26b9ad1c: am 785ad9a5: Send WEB_SEARCH intent straight to default search ↵Bjorn Bringert2010-09-161-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | provider if selected Merge commit '26b9ad1c695b627df0f6cab28df016c7fb71cafd' into gingerbread-plus-aosp * commit '26b9ad1c695b627df0f6cab28df016c7fb71cafd': Send WEB_SEARCH intent straight to default search provider if selected
| * | am 785ad9a5: Send WEB_SEARCH intent straight to default search provider if ↵Bjorn Bringert2010-09-161-0/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | selected Merge commit '785ad9a5258db19e8c98eb7969aff453af944565' into gingerbread * commit '785ad9a5258db19e8c98eb7969aff453af944565': Send WEB_SEARCH intent straight to default search provider if selected
| | * Send WEB_SEARCH intent straight to default search provider if selectedBjorn Bringert2010-09-161-0/+1
| | | | | | | | | | | | | | | Bug: 3002103 Change-Id: I51d7bd932e4ee5359da8d1361379b4413963eeb6
* | | am 4426790c: am 4346564c: Fix Google suggest and search URLs when Google ↵Bjorn Bringert2010-09-152-3/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Search is not installed Merge commit '4426790c1a89e07b2a1aaa12ca66b7d7f03d396a' into gingerbread-plus-aosp * commit '4426790c1a89e07b2a1aaa12ca66b7d7f03d396a': Fix Google suggest and search URLs when Google Search is not installed
| * | am 4346564c: Fix Google suggest and search URLs when Google Search is not ↵Bjorn Bringert2010-09-152-3/+13
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | installed Merge commit '4346564c1f6faefff5e0d3fdc7f189ec2e948019' into gingerbread * commit '4346564c1f6faefff5e0d3fdc7f189ec2e948019': Fix Google suggest and search URLs when Google Search is not installed
| | * Fix Google suggest and search URLs when Google Search is not installedBjorn Bringert2010-09-152-3/+13
| | | | | | | | | | | | | | | Bug: 3002110 Change-Id: Id49365bf53623c45bfa6f5d96d1938b801948396
* | | am 6002de42: am 6248bff9: Merge "Remove an incorrect javadoc comment." into ↵Leon Scroggins III2010-09-141-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | froyo Merge commit '6002de426803b901c93c76e488b31e7b560436f6' into gingerbread-plus-aosp * commit '6002de426803b901c93c76e488b31e7b560436f6': Remove an incorrect javadoc comment.
| * | am 6248bff9: Merge "Remove an incorrect javadoc comment." into froyoLeon Scroggins III2010-09-141-1/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '6248bff91a445c29df38f54d05b494a0e4f19897' into gingerbread * commit '6248bff91a445c29df38f54d05b494a0e4f19897': Remove an incorrect javadoc comment.
| | * Merge "Remove an incorrect javadoc comment." into froyoLeon Scroggins III2010-09-141-1/+0
| | |\
| | | * Remove an incorrect javadoc comment.Leon Scroggins III2010-09-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment references a parameter that is not part of the method. Change-Id: Ia2b5c81e4d09bb7e1614a84f2532520730244cae
* | | | am 680ee91f: am 95d9bfd1: Clear voice search mode when changing search engines.Leon Scroggins III2010-09-142-4/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '680ee91f725ac91a37791a4c57c7810c33e76e38' into gingerbread-plus-aosp * commit '680ee91f725ac91a37791a4c57c7810c33e76e38': Clear voice search mode when changing search engines.
| * | | am 95d9bfd1: Clear voice search mode when changing search engines.Leon Scroggins III2010-09-142-4/+20
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '95d9bfd1d67902a8aa5d2e529db7f7064db081b7' into gingerbread * commit '95d9bfd1d67902a8aa5d2e529db7f7064db081b7': Clear voice search mode when changing search engines.
| | * | Clear voice search mode when changing search engines.Leon Scroggins III2010-09-142-4/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Not all search engines support voice search. Also, different search engines may support them differently. So if we are already in voice search mode when the search engine changes, exit the mode. Change-Id: I8d3f200f4829ad1383d554214c9d56d5c0b96aed
* | | am 867c0465: am 430057da: Fixes for changing the search engine.Leon Scroggins III2010-09-145-16/+38
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '867c0465e9f5bd5da410fd9b721050d9e2c36c9c' into gingerbread-plus-aosp * commit '867c0465e9f5bd5da410fd9b721050d9e2c36c9c': Fixes for changing the search engine.
| * | am 430057da: Fixes for changing the search engine.Leon Scroggins III2010-09-145-16/+38
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '430057dad085f3c3dbc386f127b1f5a10a9851da' into gingerbread * commit '430057dad085f3c3dbc386f127b1f5a10a9851da': Fixes for changing the search engine.
| | * Fixes for changing the search engine.Leon Scroggins III2010-09-145-16/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a default value for the Select search engine preference. Move the Select search engine preference into advanced settings. When opening the SearchDialog with a SearchEngine other than Google, add a flag to hide the voice search icon. Depends on a change to frameworks/base. Change-Id: I6da2e582789253b3c5ffac9fe1ad3732f99f28ea
* | | resolve merge of 8bf09b62 to gingerbread-plus-aospJean-Baptiste Queru2010-09-1448-94/+2889
|\ \ \ | |/ / | | | | | | Change-Id: If94475b19837abf8f1ee427cf6f6da929cdcf105
| * | am d2670653: Add user-selected search providers to browserBjorn Bringert2010-09-1348-88/+2889
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'd26706538834e0ed58bf28f08d9a2885c0e7efcb' into gingerbread * commit 'd26706538834e0ed58bf28f08d9a2885c0e7efcb': Add user-selected search providers to browser
| | * Add user-selected search providers to browserBjorn Bringert2010-09-1348-88/+2889
| | | | | | | | | | | | | | | | | | The lists of search providers are taken from Chrome. Change-Id: I7af6dc1258950d1fc5cf86013f8be9f3c5db0f1a
* | | am 23cbeb79: DO NOT MERGE remove save/restore picture from browser appCary Clark2010-09-073-26/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '23cbeb795fe865a5c64f275bf51217fb55363cc0' into gingerbread-plus-aosp * commit '23cbeb795fe865a5c64f275bf51217fb55363cc0': DO NOT MERGE
| * | DO NOT MERGECary Clark2010-09-073-26/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove save/restore picture from browser app These pictures may be arbitrarily large, and with the newer caching mechanism, are rarely used. Also, remove any old pictures when the Browser starts. Change-Id: I0277a08735dc40e0495bf78c68fee5d95b913e27 http://b/2650945
* | | am 1a6e0e8c: Use new apply() instead of commit().Brad Fitzpatrick2010-09-024-5/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1a6e0e8cdd0898bd63f9f27df1b86cbe6722f3bb' into gingerbread-plus-aosp * commit '1a6e0e8cdd0898bd63f9f27df1b86cbe6722f3bb': Use new apply() instead of commit().
| * | Use new apply() instead of commit().Brad Fitzpatrick2010-09-014-5/+5
| | | | | | | | | | | | | | | | | | | | | apply() starts an async disk write and doesn't have a return value but is otherwise identical in observable effects. Change-Id: Id1199cd43d62882cfe7343d46e283b32404dea5d
* | | am cba8d0ef: Merge "Difficult to bookmark History items on ldpi-screens"Jean-Baptiste Queru2010-08-301-4/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'cba8d0efd388146f6814c83a363f4facdec5be2f' into gingerbread-plus-aosp * commit 'cba8d0efd388146f6814c83a363f4facdec5be2f': Difficult to bookmark History items on ldpi-screens
| * \ \ Merge "Difficult to bookmark History items on ldpi-screens"Jean-Baptiste Queru2010-08-301-4/+2
| |\ \ \
| | * | | Difficult to bookmark History items on ldpi-screensMattias Falk2010-08-171-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a History item as a bookmark by touching the star is difficult since the touch area of the star is of the size of the star. The problem is more apparent on ldpi-screens since the star is small and it's hard to hit with a finger. The browser loads the url of the History item if the star is missed. Enlarging the touch area of the star to cover the whole right part of the History item solves the problem. The user doesn't has to hit the star only the right part of the History item. Change-Id: I87b8fc555896cf88eac805c96bf31981c2aacbf5
* | | | | am 11979e05: DO NOT MERGE remove the pretend cab from the browserCary Clark2010-08-271-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '11979e058c4ea28dd77a5e598071277a8a824475' into gingerbread-plus-aosp * commit '11979e058c4ea28dd77a5e598071277a8a824475': DO NOT MERGE remove the pretend cab from the browser
| * | | | DO NOT MERGE remove the pretend cab from the browserCary Clark2010-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iab781c8e5a640d897e172a7b1ca50a1d8d81cd88 http://b/2626451
* | | | | am 552751ea: Avoid crash in browser in systems with no search providerMattias Falk2010-08-261-1/+7
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '552751ea92828f8b78b71533dbba70aa7c316d9d' into gingerbread-plus-aosp * commit '552751ea92828f8b78b71533dbba70aa7c316d9d': Avoid crash in browser in systems with no search provider
| * | | | Avoid crash in browser in systems with no search providerMattias Falk2010-08-231-1/+7
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there's no activity registered for the intent (action) ACTION_WEB_SEARCH the browser will crash if a search query is entered in the browser. The crash is avoided by catching the ActivityNotFoundException. Change-Id: I021d3210654bb3aa08ccdd15abea86ef415282b1
* | | | am 2c326e62: DO NOT MERGE Refactor find and select dialogsCary Clark2010-08-2015-115/+473
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Merge commit '2c326e62316884a20822035c5470168d0e3b89ff' into gingerbread-plus-aosp * commit '2c326e62316884a20822035c5470168d0e3b89ff': DO NOT MERGE Refactor find and select dialogs
| * | | DO NOT MERGE Refactor find and select dialogsCary Clark2010-08-2015-115/+473
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Cherry picked from master, https://android-git.corp.google.com/g/#change,53491 ) (This is a work in progress -- assets in particular are not final) Use common code when showing the select and find dialogs. Both now use similarly constructed contextual action bars and share resources where possible. Both share a common base class so supporting code can communicate with either. Companion changes in frameworks/base and external/webkit Change-Id: I476fc72b3386348bc25bcf0a3d30482dea543efe http://b/262451
generated by cgit v1.1 at 2025-02-10 06:54:05 +0000