summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Remove onTooManyRedirects as it is deprecated.Patrick Scott2010-01-0821-63/+0
|
* am fb6549b9: am d530494d: Provide a button to allow the user to set the home ↵Leon Scroggins2009-12-102-2/+3
|\ | | | | | | | | | | | | | | | | page to the current page. Merge commit 'fb6549b93476f115b4aa1a14523d98e27366d3e6' * commit 'fb6549b93476f115b4aa1a14523d98e27366d3e6': Provide a button to allow the user to set the home page to the current page.
| * Provide a button to allow the user to set the home page to the current page.Leon Scroggins2009-12-102-2/+3
| | | | | | | | Fixes http://b/issue?id=2243560
* | Add an option to the long press on image menu to save that image as the home ↵Ben Murdoch2009-11-162-0/+8
| | | | | | | | | | | | | | | | screen wallpaper. See b/2210111 Change-Id: I911633772358504f0e82fe940f9f2efc4ef403de
* | am 66a7091f: am be9560db: Tidy up the website settings activity. This is ↵Ben Murdoch2009-11-102-22/+33
|\ \ | |/ | | | | | | | | | | | | | | mostly a cosmetic change. The only functional changes are to: 1) Not dismiss the site specific settings screen when a feature is removed if that site still has more features in use, and 2) Not us Merge commit '66a7091fad8778071b88896b6bae98f100e4bb60' * commit '66a7091fad8778071b88896b6bae98f100e4bb60': Tidy up the website settings activity. This is mostly a cosmetic change. The only functional changes are to:
| * Tidy up the website settings activity. This is mostly a cosmetic change. The ↵Ben Murdoch2009-11-102-22/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | only functional changes are to: 1) Not dismiss the site specific settings screen when a feature is removed if that site still has more features in use, and 2) Not use the title of the URL extracted from the bookmarks database to identify the site if that bookmark is not the root of the origin. For example, if the user bookmarked www.google.com/foo, we do not use the title of that bookmark to identify www.google.com in the WebsiteSettingsActivity. If they had www.google.com bookmarked, then we would use that title in the WebsiteSettingsActivity. Bug: b/2252579 Change-Id: Ic4187987ae7ce40ba3678e00d0b9b848c122f380
| * Import revised translations. DO NOT MERGEEric Fischer2009-11-0620-1414/+813
| |
* | am 16231806: am aed8c32e: Merge change Ie806375b into eclair-mr2Steve Block2009-10-211-0/+3
|\ \ | |/ | | | | | | | | | | Merge commit '162318062c74428efc454078acfb21a37c279c13' * commit '162318062c74428efc454078acfb21a37c279c13': Adds toast for Geolocation permissions prompt.
| * Adds toast for Geolocation permissions prompt.Steve Block2009-10-211-0/+3
| | | | | | | | | | | | This fixes bug http://b/issue?id=2076246 Change-Id: Ie806375b22809c47a36ea5cff5699d82e9ee4dfb
* | am faf8b399: am de353621: Don\'t allow the user to save bookmarks with a ↵Ben Murdoch2009-10-141-0/+2
|\ \ | |/ | | | | | | | | | | | | | | scheme that the Browser cannot directly handle. Merge commit 'faf8b399f550c05f77de0297f8a6fb55d2fe9b2a' * commit 'faf8b399f550c05f77de0297f8a6fb55d2fe9b2a': Don't allow the user to save bookmarks with a scheme that the Browser cannot directly handle.
| * Don't allow the user to save bookmarks with a scheme that the Browser cannot ↵Ben Murdoch2009-10-141-0/+2
| | | | | | | | | | | | directly handle. Change-Id: I9cbdfeaaeef4ded3dac1623854ecb9c5c603eb91
| * Import revised translations. DO NOT MERGEEric Fischer2009-10-1320-702/+1404
| |
* | am ee302c5d: am 986174aa: Merge change I6d3d5b7e into eclair-mr2Leon Scroggins2009-10-131-1/+2
|\ \ | |/ | | | | | | | | | | Merge commit 'ee302c5da9e250d970cd60b04cd1acbdb1c1701c' * commit 'ee302c5da9e250d970cd60b04cd1acbdb1c1701c': File upload.
| * Merge change I6d3d5b7e into eclair-mr2Android (Google) Code Review2009-10-091-1/+2
| |\ | | | | | | | | | | | | * changes: File upload.
| | * File upload.Leon Scroggins2009-10-091-1/+2
| | | | | | | | | | | | | | | | | | Requires changes in external/webkit and frameworks/base. Fix http://b/issue?id=675743
* | | am 86b06ee0: am 73d5e986: Line up the progress bar with the textfield.Leon Scroggins2009-10-131-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '86b06ee03ffa5cbd9c5f60fa40ae347510feae74' * commit '86b06ee03ffa5cbd9c5f60fa40ae347510feae74': Line up the progress bar with the textfield.
| * | Line up the progress bar with the textfield.Leon Scroggins2009-10-091-0/+1
| |/ | | | | | | Fixes http://b/issue?id=2171084
* | Reimport translations.Eric Fischer2009-10-1320-4441/+6091
| | | | | | | | Change-Id: Ida53e568efdbd323294de5609bdecbd39e1e2be6
* | am 71bad392: am a9843d95: Merge change Ia16ab67e into eclair-mr2Patrick Scott2009-10-131-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '71bad392e36b1037290aeac85dc675abe3fcfdd8' * commit '71bad392e36b1037290aeac85dc675abe3fcfdd8': Change the bookmark back to cnn.com.
| * Change the bookmark back to cnn.com.Patrick Scott2009-10-071-1/+1
| | | | | | | | | | | | The snapshot issue has been fixed by adding a redirect map. Bug: 2132969
* | do not mergeCary Clark2009-10-0721-21/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Change https://android-git.corp.google.com/g/#change,27762 conflicted when the auto-merger ran -- this implements the change by hand. The original comments: Add '&android-home' to the google homepage string Also, mark it as non-translatable, and remove the translated versions. fixes http://b/issue?id=2148022
* | am 0de55a33: am 5f3ecb74: Merge change I5c303ac8 into eclairSteve Block2009-10-011-28/+53
|\ \ | |/ | | | | | | | | | | Merge commit '0de55a338666a847b55d404aa20246f24bef88e5' * commit '0de55a338666a847b55d404aa20246f24bef88e5': Adds black and white line above geolocation permissions prompt. Also increases spacing between checkbox and 'remember' text.
| * Merge change I5c303ac8 into eclairAndroid (Google) Code Review2009-10-011-28/+53
| |\ | | | | | | | | | | | | * changes: Adds black and white line above geolocation permissions prompt. Also increases spacing between checkbox and 'remember' text.
| | * Adds black and white line above geolocation permissions prompt. Also ↵Steve Block2009-10-011-28/+53
| | | | | | | | | | | | | | | | | | | | | | | | increases spacing between checkbox and 'remember' text. This is a fix for bug http://b/issue?id=2076246. Change-Id: I5c303ac873b50bf1ca4bc7a6ccd3365bd4dfbb22
* | | am 0bfecb01: am a753d009: Update the icon in the Add New Bookmark dialog and ↵Ben Murdoch2009-10-011-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | add a separator between the title and UI widgets. Merge commit '0bfecb01cd20f6c1c0515c86e8c274a33db49556' * commit '0bfecb01cd20f6c1c0515c86e8c274a33db49556': Update the icon in the Add New Bookmark dialog and add a separator between the title and UI widgets.
| * | Update the icon in the Add New Bookmark dialog and add a separator between ↵Ben Murdoch2009-10-011-0/+9
| |/ | | | | | | | | | | the title and UI widgets. Change-Id: I2e6b75a4205a2fdc7a2dbecf276e1ad5cf567d75
* | am d43041cf: am 18edf869: Remove the shadow in the bookmark as it doesn\'t ↵Grace Kloba2009-10-011-0/+1
|\ \ | |/ | | | | | | | | | | | | | | have title. Merge commit 'd43041cfd104832753f943b5fbb16693709f87d0' * commit 'd43041cfd104832753f943b5fbb16693709f87d0': Remove the shadow in the bookmark as it doesn't have title.
| * Remove the shadow in the bookmark as it doesn't have title.Grace Kloba2009-09-301-0/+1
| | | | | | Fix http://b/issue?id=2158516
* | am 3e3064dd: am bd7d5178: Adjust the spacing between the title and ↵Leon Scroggins2009-10-011-1/+1
|\ \ | |/ | | | | | | | | | | | | | | bookmarks/stop button. Merge commit '3e3064dd83da115144891208ab883d1a41d4180a' * commit '3e3064dd83da115144891208ab883d1a41d4180a': Adjust the spacing between the title and bookmarks/stop button.
| * Adjust the spacing between the title and bookmarks/stop button.Leon Scroggins2009-09-301-1/+1
| | | | | | | | | | | | | | | | Makes the spacing look more like the spacing between the search bar's go button and microphone button, which are roughly in the place. Change-Id: I61d8619c3af8daa3e33ff5b263819f0ffdadb553
* | am 7717ab32: am 84a2df8e: Merge change I3c58dbaa into eclairLeon Scroggins2009-10-014-0/+0
|\ \ | |/ | | | | | | | | | | Merge commit '7717ab323d41d55469dc75098a34dca17e142d90' * commit '7717ab323d41d55469dc75098a34dca17e142d90': New assets. This makes the title bar's button match the voice button.
| * Merge change I3c58dbaa into eclairAndroid (Google) Code Review2009-09-304-0/+0
| |\ | | | | | | | | | | | | * changes: New assets. This makes the title bar's button match the voice button.
| | * New assets. This makes the title bar's button match the voice button.Leon Scroggins2009-09-304-0/+0
| | | | | | | | | | | | Change-Id: I3c58dbaa02b5f81c6db5fb96ec1b8021728a5e66
* | | am 79d3eb5f: am 4df3c35c: Merge change Ie3890f91 into eclairNicolas Roard2009-10-014-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '79d3eb5f0bdcbf558c93d09564d2572592fb5536' * commit '79d3eb5f0bdcbf558c93d09564d2572592fb5536': Fixes
| * | Merge change Ie3890f91 into eclairAndroid (Google) Code Review2009-09-304-0/+0
| |\ \ | | | | | | | | | | | | | | | | * changes: Fixes
| | * | FixesNicolas Roard2009-09-304-0/+0
| | | |
* | | | am a60c6c72: am e64b3a09: Update ESPN default bookmark to point to espn.com ↵Ben Murdoch2009-10-011-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | so we get redirected to the mobile site. Merge commit 'a60c6c728b1d4ad67cf962be85f0c195f765d654' * commit 'a60c6c728b1d4ad67cf962be85f0c195f765d654': Update ESPN default bookmark to point to espn.com so we get redirected to the mobile site.
| * | | Update ESPN default bookmark to point to espn.com so we get redirected to ↵Ben Murdoch2009-09-301-1/+1
| |/ / | | | | | | | | | | | | | | | the mobile site. Change-Id: I7793e77b4ae29c60185c6819430a2adbeb5d4a35
* | | am f1e80834: am 9725fac3: Merge change I9cdaba5e into eclairNicolas Roard2009-10-0116-6/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'f1e80834961948f18dd07ea26ac385b521454682' * commit 'f1e80834961948f18dd07ea26ac385b521454682': New assets for settings
| * | Merge change I9cdaba5e into eclairAndroid (Google) Code Review2009-09-3016-6/+6
| |\ \ | | | | | | | | | | | | | | | | * changes: New assets for settings
| | * | New assets for settingsNicolas Roard2009-09-3016-6/+6
| | | |
* | | | am 0794e4ad: am 1336e6da: Remove unused assets.Leon Scroggins2009-10-0132-72/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '0794e4ad35d66a273184a158b773a5dd5398b7f7' * commit '0794e4ad35d66a273184a158b773a5dd5398b7f7': Remove unused assets.
| * | | Remove unused assets.Leon Scroggins2009-09-3032-72/+0
| | |/ | |/| | | | | | | Change-Id: I591c987be33b032289232cf7ae8aa45ee4e4957c
* | | am 19bd5c8a: am f59fb4ef: Merge change I417aa61d into eclairLeon Scroggins2009-10-013-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '19bd5c8a78337008d0f8369e73472926c966e10b' * commit '19bd5c8a78337008d0f8369e73472926c966e10b': New asset for the bookmark button in the title bar.
| * | Merge change I417aa61d into eclairAndroid (Google) Code Review2009-09-303-1/+1
| |\ \ | | | | | | | | | | | | | | | | * changes: New asset for the bookmark button in the title bar.
| | * | New asset for the bookmark button in the title bar.Leon Scroggins2009-09-303-1/+1
| | |/ | | | | | | | | | | | | | | | Fixes http://b/issue?id=2145205 Change-Id: I417aa61d7613fea274c22c8c8a8fe8ba38cdf5d2
* | | am 1c8cd377: am 306feaf5: Merge change Ibf40bd9e into eclairLeon Scroggins2009-10-015-34/+76
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1c8cd3772ee62d5f44daba9a51ed8b6757e52500' * commit '1c8cd3772ee62d5f44daba9a51ed8b6757e52500': Slide the title bar onto the screen rather than stretching it.
| * | Merge change Ibf40bd9e into eclairAndroid (Google) Code Review2009-09-305-34/+76
| |\ \ | | | | | | | | | | | | | | | | * changes: Slide the title bar onto the screen rather than stretching it.
| | * | Slide the title bar onto the screen rather than stretching it.Leon Scroggins2009-09-305-34/+76
| | |/ | | | | | | | | | | | | | | | | | | | | | Fix for http://b/issue?id=2154614 Also update the header for the find dialog animations. Change-Id: Ibf40bd9ee12c270c2794d4d2316143686a072458
* | | am b3482d77: am bd955bf1: Merge change I834ba6d2 into eclairBen Murdoch2009-10-011-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'b3482d77a796ef46678639d2e914cd5a8f4fd799' * commit 'b3482d77a796ef46678639d2e914cd5a8f4fd799': Update the CNN bookmark to point to www.cnn.com/index.html. (Bug 2139637)