summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2012-08-061-3/+3
| | | | | Change-Id: I1e4b5a4202608da284798f8ed651825bd2288408 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEYing Wang2012-08-031-1/+1
| | | | | Change-Id: I8db42af7c50fc23b66f637b72c3c8d65abe9fdd6 Auto-generated-cl: translation import
* am 3c2ab032: Explicitly export content providersNick Kralevich2012-08-011-0/+1
|\ | | | | | | | | * commit '3c2ab0322d40a0eac3b482052532e27d20399f65': Explicitly export content providers
| * Explicitly export content providersNick Kralevich2012-07-301-0/+1
| | | | | | | | | | | | | | | | | | In a future version of Android, the default value for <provider android:exported> will change from true to false. Explicitly set android:exported="true" Bug: 3306452 Change-Id: Ic8adfe95ce0e8b5a33a8de4f5ac4f4ff184a67e8
* | Import translations. DO NOT MERGEYing Wang2012-07-301-2/+1
|/ | | | | Change-Id: If0dc8940b5d312dec7ab4803ce80ac65697495b5 Auto-generated-cl: translation import
* am 39e7dfee: Merge "Stop loading subview in stopAllLoading"John Reck2012-07-271-1/+1
|\ | | | | | | | | * commit '39e7dfee746d73670eea435024a80ae9dbedf176': Stop loading subview in stopAllLoading
| * Merge "Stop loading subview in stopAllLoading"John Reck2012-07-271-1/+1
| |\
| | * 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
* | 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
* | am 3f5abd72: Reconcile with jb-releaseThe Android Open Source Project2012-07-040-0/+0
|\ \ | |/ | | | | | | * commit '3f5abd721a1603f859ca7c8b8d77e103bd904395': Remove ORDER BY clause on Search Suggestion queries.
| * Reconcile with jb-releaseThe Android Open Source Project2012-07-040-0/+0
| |\ | | | | | | | | | Change-Id: I98846bdcbacded08caf473127115970d08770a6d
| | * 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
* | | 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
* | | | Import translations. DO NOT MERGEYing Wang2012-06-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ia1aaa4960cd30f6b5ab5cb7a8eb3f7b9be194684
* | | | am dc743aad: Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit 'dc743aad320f443f4caffbabea8dc6d3af538766':
| * | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I5be539a659d1dc2da52b31a7fdabdf53aa3511b1
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-140-0/+0
| | |\ \ | | | |/ | | |/|
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-120-0/+0
| | | |\
* | | | | Import translations. DO NOT MERGEYing Wang2012-06-183-7/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I1620793215d53ea8303dcc4ce27c63d66dd22233
* | | | | 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
* | | | | Merge "Don't use the new task flag for download."Teng-Hui Zhu2012-06-131-1/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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
* | | | | am 61bb5caa: (-s ours) am eb2c7c2d: Import translations. DO NOT MERGEEric Fischer2012-06-120-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit '61bb5caabb5836e4dfff1ef0a66be237d1213b2e': Import translations. DO NOT MERGE
| * | | 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
* | | | am 59f7e90d: (-s ours) am ab217abe: (-s ours) am 27bcac31: (-s ours) Merge ↵Geremy Condra2012-06-110-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | "DO NOT MERGE Modify browser file origin policy." * commit '59f7e90d1ab53ae207546eadbed48914be1444af': DO NOT MERGE Modify browser file origin policy.
| * | | am ab217abe: (-s ours) am 27bcac31: (-s ours) Merge "DO NOT MERGE Modify ↵Geremy Condra2012-06-110-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | browser file origin policy." * commit 'ab217abee18fa9a67e274f59ee5f8fc35345f3d1': DO NOT MERGE Modify browser file origin policy.
| | * \ \ am 27bcac31: (-s ours) Merge "DO NOT MERGE Modify browser file origin policy."Geremy Condra2012-06-110-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '27bcac317d3e5467c42e4014f0e5ec4d6f6ab494': DO NOT MERGE Modify browser file origin policy.
| | | * \ \ Merge "DO NOT MERGE Modify browser file origin policy."Geremy Condra2012-06-111-0/+3
| | | |\ \ \ | | |/ / / /
| | | * | | DO NOT MERGE Modify browser file origin policy.Selim Gurun2012-06-061-0/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6212665 Modify browser's file origin policy to match Chrome's. This is a cherry-pick from master. sha: 559317c0ef684a8e9a77443343ff61a263e31168 Change-Id: Idafb4f93f61d9503df6cb0d6cedcc85a00a9827b
* | | | | Import translations. DO NOT MERGEEric Fischer2012-06-112-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I4bf9e7d24807658e20c687014501fa9aa18c0405
* | | | | Merge "Fixup browser after hidden API refactor"Jonathan Dixon2012-06-082-6/+12
|\ \ \ \ \
| * | | | | Fixup browser after hidden API refactorJonathan Dixon2012-06-082-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Interdepends on https://android-git.corp.google.com/g/#/c/198193 Change-Id: I9f44c0f4f84674965b7afc652420986314e2fc8e
* | | | | | am c715b9a4: Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | * commit 'c715b9a4ec384e813f542a003ad4e2737b86b348':
| * | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | Change-Id: I7e58aa4eefafa172c5fae884edf6257f13c64b73
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-060-0/+0
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-050-0/+0
| | | |\ \ \