summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am e3bc6799: (-s ours) am 3963b6c9: (-s ours) am 8ba13bcb: DO NOT MERGE - ↵Ed Tam2011-05-240-0/+0
|\ | | | | | | | | | | | | Backport RLZ code to GB: - Cache RLZ parameter - Set RLZ parameter for address bar searches - Add broadcast receiver to handle RLZ updates - Update RLZ parameters in home page and bookmarks Bug: 4 * commit 'e3bc67990043c5beefa2b3f782d96a6c34911c20': DO NOT MERGE - Backport RLZ code to GB: - Cache RLZ parameter - Set RLZ parameter for address bar searches - Add broadcast receiver to handle RLZ updates - Update RLZ parameters in home page and bookmarks Bug: 4436761
| * am 3963b6c9: (-s ours) am 8ba13bcb: DO NOT MERGE - Backport RLZ code to GB: ↵Ed Tam2011-05-230-0/+0
| |\ | | | | | | | | | | | | | | | | | | - Cache RLZ parameter - Set RLZ parameter for address bar searches - Add broadcast receiver to handle RLZ updates - Update RLZ parameters in home page and bookmarks Bug: 4436761 * commit '3963b6c93a182ffbfe591bb4ca5ccf38a6188900': DO NOT MERGE - Backport RLZ code to GB: - Cache RLZ parameter - Set RLZ parameter for address bar searches - Add broadcast receiver to handle RLZ updates - Update RLZ parameters in home page and bookmarks Bug: 4436761
| | * am 8ba13bcb: DO NOT MERGE - Backport RLZ code to GB: - Cache RLZ parameter ↵Ed Tam2011-05-236-0/+260
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | - Set RLZ parameter for address bar searches - Add broadcast receiver to handle RLZ updates - Update RLZ parameters in home page and bookmarks Bug: 4436761 * commit '8ba13bcb1ad5ab8b439fcc53d158bdafa327a2e8': DO NOT MERGE - Backport RLZ code to GB: - Cache RLZ parameter - Set RLZ parameter for address bar searches - Add broadcast receiver to handle RLZ updates - Update RLZ parameters in home page and bookmarks Bug: 4436761
| | | * DO NOT MERGE - Backport RLZ code to GB:Ed Tam2011-05-176-0/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Cache RLZ parameter - Set RLZ parameter for address bar searches - Add broadcast receiver to handle RLZ updates - Update RLZ parameters in home page and bookmarks Bug: 4436761 Change-Id: I7ce0e7bead7954ed9ebfe10b66242553f14ed6f2
* | | | am adc265c0: (-s ours) am 7d019020: DO NOT MERGE use -sw instead of -wJohn Reck2011-05-230-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'adc265c093ddda9aeee3abc88861718713ea383a': DO NOT MERGE use -sw instead of -w
| * | | am 7d019020: DO NOT MERGE use -sw instead of -wJohn Reck2011-05-208-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '7d019020fdab380866cd1e1ad429a959baeb3c39': DO NOT MERGE use -sw instead of -w
| | * | | DO NOT MERGE use -sw instead of -wJohn Reck2011-05-208-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I704b7a026298901da01d98e33df287d63cd3a265
* | | | | Initial implementation of the useragent switcherJohn Reck2011-05-237-4/+89
| | | | | | | | | | | | | | | | | | | | Change-Id: Iaa8262a678902645dbfaa8a53fe7212af7d9d53c
* | | | | Merge "Change -w600dp to -sw600dp"John Reck2011-05-207-0/+0
|\ \ \ \ \
| * | | | | Change -w600dp to -sw600dpJohn Reck2011-05-207-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5303efd4eb81e5dd152aebbe200a0610e165fcf3
| | | | | |
| \ \ \ \ \
*-. \ \ \ \ \ Reconcile with gingerbread-release honeycomb-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | Change-Id: Ic955d22bdfe282546ada37299aa4ce413428c2a6
| | * | | | | Fix ISE in History page (DO NOT MERGE)Dave Burke2011-02-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corresponding change in master was https://android-git.corp.google.com/g/#change,95446 Bug: 3427773 Change-Id: Iaa7a5620285797cd6d3e15e9f5e058ca553a5951
| | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | | |\ \ \ \ \ | | |/ / / / / /
| | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | | | |\ \ \ \ \ | | | |/ / / / / /
| | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | | | | |\ \ \ \ \ | | | | |/ / / / / /
| | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-030-0/+0
| | | | | |\ \ \ \ \ | | | | |/ / / / / /
| | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-030-0/+0
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-030-0/+0
| | | | | | |\ \ \ \ \ | | | | | |/ / / / / /
| | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-020-0/+0
| | | | | | |\ \ \ \ \
| | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-020-0/+0
| | | | | | | |\ \ \ \ \
| | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-010-0/+0
| | | | | | | | |\ \ \ \ \
| | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-310-0/+0
| | | | | | | | | |\ \ \ \ \
| | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-300-0/+0
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-300-0/+0
| | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-280-0/+0
| | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-280-0/+0
| | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-270-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-260-0/+0
| | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-250-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-240-0/+0
| | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-230-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | |/ / / / / /
| | | | | | | | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-220-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | |/ / / / / /
| | | | | | | | | | | | | | | | | | * | | | | Updated Browser launcher iconJustin Ho2011-01-212-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibdc5e171bff93428f772c54d91c3fe095fad10d2
| | | | | | | | | | | | | | | | | | * | | | | Updated assets (app icon & default thumbnail)John Reck2011-01-214-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3378251 Change-Id: I1ae4890b9e6fdb60e7a7dca8c4b2f77939655cbe
| | | | | | | | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-210-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-200-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-190-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | * | | | | Protect access to mWebView by checking mRunnable.Patrick Scott2011-01-181-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user cancels the login event, mRunnable will be reset and the WebView destroyed. Check for a null mRunnable before accessing mWebView. Bug: 3361009 Bug: 3349815 Change-Id: Idd9a2b788673d9ec95bfa083a4af7df705c22fcd
| | | | | | | | | | | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-180-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | * | | | | Merge "Skip auto sign-in if the user is already logged in." into honeycombPatrick Scott2011-01-132-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | * | | | | Different approach to auto signin.Patrick Scott2011-01-138-404/+355
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On startup, attempt to log the user into google sites. Show a progress dialog that the user can cancel if login takes too long. Add a new preference for toggling auto signin. This preference shows the current account and allows the user to choose the account to use. If there are no accounts, the option is disabled. The saved account is validated each time it is accessed in case the account was removed. Bug: 3278072 Change-Id: I10ce1dc57a683b2820b17ef6955577037c82f332
| | | | | | | | | | | | | | | | | | | | | | | | | * | | | | Merge "Fix 3337625 to follow link to Google Images" into honeycombRussell Brenner2011-01-131-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \