summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
| | | |\ \ \
| | | | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-040-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-030-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-310-0/+0
| | | | | | |\ \ \
* | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I727ce7491f5483729517900a4fc4ae42eff525fa
* | | | | | | | | | am d586d22d: am 1df6df7e: Don\'t show stale thumbnailsJohn Reck2012-06-052-1/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd586d22de1dddb6c595727e87f3cd64e38501692': Don't show stale thumbnails
| * | | | | | | | | 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
* | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaceec026da21eeece8afc2fcb4df2a4ef4800d6b
* | | | | | | | | am 80f6d057: am 3c573ac4: Merge "Enable voice search in omnibox" into jb-devMichael Kolb2012-06-0512-15/+109
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80f6d0574a9655fac3bd219afcb1810d0f66a57f': Enable voice search in omnibox
| * | | | | | | | am 3c573ac4: Merge "Enable voice search in omnibox" into jb-devMichael Kolb2012-06-0412-15/+109
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c573ac4dbc0e9a117a9540c410911bab52dffa7': Enable voice search in omnibox
| | * | | | | | | Merge "Enable voice search in omnibox" into jb-devMichael Kolb2012-06-0412-15/+109
| | |\ \ \ \ \ \ \
| | | * | | | | | | Enable voice search in omniboxMichael Kolb2012-06-0412-15/+109
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6601348 Bring back voice search. Also fixes focus bug for fixed titlebar. Change-Id: I83c8ad96957b62c23ad0bbb35685712687d11213
* | | | | | | | | am c5261afa: (-s ours) am 5a8a0f40: Import translations. DO NOT MERGEEric Fischer2012-06-050-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c5261afa465cdb0f1970ba5fa6318e931cb28b0a': Import translations. DO NOT MERGE
| * | | | | | | | am 5a8a0f40: Import translations. DO NOT MERGEEric Fischer2012-06-041-3/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a8a0f40caf0d9e0e2e1b8689a8b8ec091569fcf': Import translations. DO NOT MERGE
| | * | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-041-3/+3
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibf82f8bf961445d0745f5c222b263cb03f621e7c
* | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-043-7/+5
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Change-Id: Ifb0c7ac9e94c1dbfd3673d23edf0e2006cb21ae4
* | | | | | | am 7aae2532: am 9d64d9a8: Merge "Fix seznam\'s suggest URL" into jb-devJohn Reck2012-06-031-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '7aae2532c247efc4bb815ff4962526120d24d5ad': Fix seznam's suggest URL
| * | | | | | am 9d64d9a8: Merge "Fix seznam\'s suggest URL" into jb-devJohn Reck2012-06-031-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '9d64d9a8016cc862296b20c4db545018373bdea5': Fix seznam's suggest URL
| | * | | | | Merge "Fix seznam's suggest URL" into jb-devJohn Reck2012-06-031-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix seznam's suggest URLJohn Reck2012-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6578384 http:/// has one too many /'s Change-Id: I604d047872c910b8d71ac83d4c86cbdea17aba4b
* | | | | | | am 0bb6509d: (-s ours) am f4f58054: Import translations. DO NOT MERGEEric Fischer2012-06-010-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '0bb6509d2df39ce869a37373c817c352075c77bd': Import translations. DO NOT MERGE