summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* am 39e7dfee: Merge "Stop loading subview in stopAllLoading"John Reck2012-07-271-1/+1
|\ | | | | | | | | * commit '39e7dfee746d73670eea435024a80ae9dbedf176': Stop loading subview in stopAllLoading
| * Stop loading subview in stopAllLoadingMattias Nilsson2012-07-271-1/+1
| | | | | | | | | | | | | | The main webview is stopped twice instead of stopping the subview loading. Correcting this cut and paste error. Change-Id: Ic12c7219d222d42f59e27f1cda0cd65a003b41ca
* | am 06f337b3: am bc681880: Remove ORDER BY clause on Search Suggestion queries.Ben Murdoch2012-07-041-4/+1
|\ \ | |/ | | | | | | * commit '06f337b3976ad2093388932bac0003b371bccc5e': Remove ORDER BY clause on Search Suggestion queries.
| * am bc681880: Remove ORDER BY clause on Search Suggestion queries.Ben Murdoch2012-07-041-4/+1
| |\ | | | | | | | | | | | | * commit 'bc681880294a2e31a1325101917b6e36fd411bde': Remove ORDER BY clause on Search Suggestion queries.
| | * Remove ORDER BY clause on Search Suggestion queries.Ben Murdoch2012-07-041-4/+1
| | | | | | | | | | | | | | | | | | | | | Do not apply any ordering to results returned by the Browser Provider when responding to search suggestions. Change-Id: Ia487bc708d04ee629681692b5416ae65c6017012
* | | Show voice button only on voice enabled devicesMichael Kolb2012-06-262-7/+8
| | | | | | | | | | | | | | | | | | Bug: 6686590 Change-Id: If3a79ec8b848d0c5d001e0c38de5973bb6a166a1
* | | Merge "Disable URL overriding on redirects"John Reck2012-06-145-1/+20
|\ \ \
| * | | Disable URL overriding on redirectsJohn Reck2012-06-145-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5334118 When sending an intent for a URL with specialized handlers, tag it with an extra that will surpress subsequent redirections Change-Id: I997aa79192baea86c58958ab213200d57ec4c4f9
* | | | am 17e3ba9b: am a770f8d4: Encode characters that java.net.URI rejectsSelim Gurun2012-06-142-5/+15
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '17e3ba9b808c0ca3b4a06c3964437204e76f9d30': Encode characters that java.net.URI rejects
| * | | am a770f8d4: Encode characters that java.net.URI rejectsSelim Gurun2012-06-132-5/+15
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'a770f8d4bd583e9a719af6ce314838db12003b33': Encode characters that java.net.URI rejects
| | * | Encode characters that java.net.URI rejectsSelim Gurun2012-06-132-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5952386 Our java.net.URI implementation conforms to an old obsolete RFC and it is very restrictive. Since in our download path, we use download manager and so java.net.URI, this causes an odd bug (i.e. URIs that are fetched fine by chromium http stack fails when download manager is used). Also there is a second bug that when URI parsing fails and an exception is thrown, we fail to catch it and crash. This CL fixes both. Change-Id: I62ac289566efae97dd2161b8041b06a0a87211cb
* | | | Don't use the new task flag for download.Teng-Hui Zhu2012-06-131-1/+0
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | This flag can incorrectly turn the Gallery app into a new task when trying to play some video. bug:6652951 Change-Id: Iec18ac0c9514101780e7cc6361dbce6c1e9320cb
* | | Merge "Fixup browser after hidden API refactor"Jonathan Dixon2012-06-081-4/+5
|\ \ \ | |/ / |/| |
| * | Fixup browser after hidden API refactorJonathan Dixon2012-06-081-4/+5
| | | | | | | | | | | | | | | | | | Interdepends on https://android-git.corp.google.com/g/#/c/198193 Change-Id: I9f44c0f4f84674965b7afc652420986314e2fc8e
* | | am 1df6df7e: Don\'t show stale thumbnailsJohn Reck2012-06-052-1/+3
|\ \ \ | | |/ | |/| | | | | | | * commit '1df6df7e33601f1dcd6358a1eea9c34bc6373927': Don't show stale thumbnails
| * | Don't show stale thumbnailsJohn Reck2012-06-052-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6610952 We don't null item.thumbnail because we want to recycle the bitmap if the item changes, so add a boolean saying whether or not we have an actual thumbnail to show to avoid showing stale data Change-Id: Ibfd485cb7f3ea8991222b8e99704170bf331472b
* | | am 3c573ac4: Merge "Enable voice search in omnibox" into jb-devMichael Kolb2012-06-047-14/+92
|\ \ \ | |/ / | | / | |/ |/| * commit '3c573ac4dbc0e9a117a9540c410911bab52dffa7': Enable voice search in omnibox
| * Enable voice search in omniboxMichael Kolb2012-06-047-14/+92
| | | | | | | | | | | | | | | | Bug: 6601348 Bring back voice search. Also fixes focus bug for fixed titlebar. Change-Id: I83c8ad96957b62c23ad0bbb35685712687d11213
* | am ed19512a: Merge "Add null check" into jb-devJohn Reck2012-05-301-1/+1
|\ \ | |/ | | | | | | * commit 'ed19512a329e66afaf48c8346b823e5fcc73bd02': Add null check
| * Add null checkJohn Reck2012-05-301-1/+1
| | | | | | | | | | | | Bug: 6584413 Change-Id: I63e94129fb0830e87d47ffca1d402a8aa838ac20
* | am 244cdfa6: Merge "Prevent the monkies with a sledgehammer" into jb-devJohn Reck2012-05-304-52/+302
|\ \ | |/ | | | | | | * commit '244cdfa6eb0745a4b681cb704f5564050d88f7ed': Prevent the monkies with a sledgehammer
| * Merge "Prevent the monkies with a sledgehammer" into jb-devJohn Reck2012-05-304-52/+302
| |\
| | * Prevent the monkies with a sledgehammerJohn Reck2012-05-304-52/+302
| | | | | | | | | | | | | | | | | | | | | Bug: 6515134 If we never have a null mController, we can never have a NPE! Change-Id: Idf90b94e6557e0afd6dd92602b8e4dfd189218d1
* | | am f788adcf: Merge "Make sure focusSearch doesn\'t return a detached ↵John Reck2012-05-301-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | webview" into jb-dev * commit 'f788adcf8b3be878d174f5b7c2396c0d19540d7f': Make sure focusSearch doesn't return a detached webview
| * | Merge "Make sure focusSearch doesn't return a detached webview" into jb-devJohn Reck2012-05-301-2/+4
| |\ \
| | * | Make sure focusSearch doesn't return a detached webviewJohn Reck2012-05-301-2/+4
| | |/ | | | | | | | | | | | | | | | Bug: 6535227 Change-Id: I18bf24117d8ffcbbd440b2a47b2db422e41894f4
* | | am 06b7e0fa: Merge "tighten nav bar layout & fix animation bug" into jb-devMichael Kolb2012-05-303-13/+40
|\ \ \ | |/ / | | | | | | | | | * commit '06b7e0fafdee08f7045f419b19eb1aacb00d7d60': tighten nav bar layout & fix animation bug
| * | Merge "tighten nav bar layout & fix animation bug" into jb-devMichael Kolb2012-05-303-13/+40
| |\ \
| | * | tighten nav bar layout & fix animation bugMichael Kolb2012-05-293-13/+40
| | |/ | | | | | | | | | | | | | | | Bug: 6563289 Change-Id: I00fdecf645128bb1fec8e23be94aa2b85fb586f7
* | | am 41597569: Merge "Only change text in url input when it changed" into jb-devMichael Kolb2012-05-301-1/+3
|\ \ \ | |/ / | | | | | | | | | * commit '4159756953c0ada88f774828d6a1f329564d222b': Only change text in url input when it changed
| * | Only change text in url input when it changedMichael Kolb2012-05-291-1/+3
| |/ | | | | | | | | | | Bug: 6556693 Change-Id: Iad0f285f89710de1bbdf7ab5f727bdc81d4ef387
* | am f695f6b4: Tell Browser to monitor the WebCore thread for responsiveness.Ben Murdoch2012-05-241-0/+1
|\ \ | |/ | | | | | | * commit 'f695f6b4399f3a60a5d9d0aa39b8c341e8b8592a': Tell Browser to monitor the WebCore thread for responsiveness.
| * Tell Browser to monitor the WebCore thread for responsiveness.Ben Murdoch2012-05-241-0/+1
| | | | | | | | | | | | | | | | We no longer enable the WebCore thread watchdog for all WebViews, but we still want the functionality in Browser. Bug: 6447214 Change-Id: I1665bef875d53239203bc6313ac39af4bda6a60b
* | am c90effde: Merge "Disable fixed title bar in quick controls" into jb-devJohn Reck2012-05-231-3/+8
|\ \ | |/ | | | | | | * commit 'c90effdedc1c38eabc2c731d5a55c17f881862b1': Disable fixed title bar in quick controls
| * Disable fixed title bar in quick controlsJohn Reck2012-05-231-3/+8
| | | | | | | | | | | | Bug: 6546959 Change-Id: I7511497869ddf7b5107d73c378b88a6363d08ce6
* | am 57b7b8a3: Merge "Fix portrait\'s fixed title bar" into jb-devJohn Reck2012-05-213-24/+115
|\ \ | |/ | | | | | | * commit '57b7b8a301dcfd1686396ce118526c8a7e2d4245': Fix portrait's fixed title bar
| * Fix portrait's fixed title barJohn Reck2012-05-183-24/+115
| | | | | | | | | | | | Bug: 6468013 Change-Id: Ia6ee9645df9ebb8aa98734efef45b57db94651f7
* | am 501fa728: Merge "Added a menu item in Browser called Close other tabs"Jean-Baptiste Queru2012-05-173-0/+28
|\ \ | | | | | | | | | | | | * commit '501fa7284ae63fe28b8f81f403f24befa7c992dd': Added a menu item in Browser called Close other tabs
| * | Added a menu item in Browser called Close other tabsAfzal Najam2012-05-173-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | This closes all other tabs except the current one (only for the phone interface) Will submit patch for tablet interface once this is approved. It solves the problem of mass closing unneeded tabs to a certain extent. Preferred method would be to select multiple tabs like list items. Change-Id: I5af00f1c19043104987375f1da396eb6fefb5dd4
* | | am 26bebab1: Merge "Monkey" into jb-devJohn Reck2012-05-161-1/+3
|\ \ \ | | |/ | |/| | | | | | | * commit '26bebab15e925f887ed2f85bccda03083a182289': Monkey
| * | Merge "Monkey" into jb-devJohn Reck2012-05-161-1/+3
| |\ \
| | * | MonkeyJohn Reck2012-05-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6404028 Change-Id: I84935de2d159058c373551ebf22306381089ef05
* | | | am fe935632: Merge "Toggle QC request desktop icon" into jb-devMichael Kolb2012-05-163-1/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'fe9356329710e8fae22bb3dc5f6aea86ae3cb87e': Toggle QC request desktop icon
| * | | Merge "Toggle QC request desktop icon" into jb-devMichael Kolb2012-05-163-1/+13
| |\ \ \
| | * | | Toggle QC request desktop iconMichael Kolb2012-05-163-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6493939 Change-Id: I7787ab37b57fce8ea2332fefd1ace420357000ec
* | | | | am b9b29311: Merge "Add setting to control tabs per app behavior" into jb-devMichael Kolb2012-05-163-1/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'b9b293119d3a4a94b5d05d8e555070738ca3c36f': Add setting to control tabs per app behavior
| * | | | Add setting to control tabs per app behaviorMichael Kolb2012-05-163-1/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 5890701 Change-Id: I6a47c7bff260dd8ded3a4c360f186ce8f670c67e
* | | | am 234eadcf: Don\'t wait on ContactsProviderBen Murdoch2012-05-162-20/+43
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '234eadcf7d0dbf2d24f92c24f40343d518f6fe3a': Don't wait on ContactsProvider
| * | | Don't wait on ContactsProviderBen Murdoch2012-05-162-20/+43
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now during the initial WebSettings sync to native we wait for the autofill profile to be loaded from disk so that it can be synced. If there's no profile set, then we try to infer a profile from the user's Me contact profile. Querying the Me contact can be slow and in some extreme cases can cause the settings sync on the UI thread to block long enough to show an ANR. Instead signal the threads (via the CountdownLatch) waiting on the initial import before we do the Me profile lookup. Note that we still may block the UI thread if the lookup of an already saved profile takes an exceptionally long time. This is so that when a user has saved a profile, we'll never resort to showing them the "setup autofill" message. (But all ANR reports to date have shown that we were querying the Me contact at the time of ANR). Bug: 6371781 Change-Id: Ibb0d5e285ec3587d9f9bad3e69b79890850c2f6d
* | | am 54217b39: Hide webview when showing a custom viewMichael Kolb2012-05-151-0/+2
|\ \ \ | |/ / | | | | | | | | | * commit '54217b39d7d097f2f4fe9fac928a1c3bf1b9f13f': Hide webview when showing a custom view