summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | am b97f51f5: am 253bd01f: am a1f40f93: Pass ClipData in media capture Intent.Ben Murdoch2014-10-270-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | * commit 'b97f51f504e21a92a767dfe4a6ca21ad196006fc':
| | * | | am 253bd01f: am a1f40f93: Pass ClipData in media capture Intent.Ben Murdoch2014-09-221-1/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '253bd01f659ed14aeb2352a0296ba9bf58a0b37e': Pass ClipData in media capture Intent.
| | | * \ \ am a1f40f93: Pass ClipData in media capture Intent.Ben Murdoch2014-09-221-1/+6
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a1f40f93fc1eb046a06683cafc62205a7ec6ca0c': Pass ClipData in media capture Intent.
* | | | \ \ \ am 1cbf0a8f: am 257d565a: am 885694b2: am 481681a1: Using .jpg as suffix of ↵Tao Bai2014-10-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | | | | | | the temporay file for camera. * commit '1cbf0a8f7e29cbd50bc3b3b8ba26ba0836e10569':
| * | | | | am 257d565a: am 885694b2: am 481681a1: Using .jpg as suffix of the temporay ↵Tao Bai2014-10-270-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | file for camera. * commit '257d565a9d374fd3a22d4732004f77ee1459083b':
| | * | | | am 885694b2: am 481681a1: Using .jpg as suffix of the temporay file for camera.Tao Bai2014-09-191-22/+21
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '885694b20834a49f4c6b5d69ab25eace36f16f93': Using .jpg as suffix of the temporay file for camera.
| | | * | | am 481681a1: Using .jpg as suffix of the temporay file for camera.Tao Bai2014-09-191-22/+21
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '481681a1d37ea51a6b1ee53600efeb5013666c58': Using .jpg as suffix of the temporay file for camera.
* | | | \ \ \ am 3ebf7134: am a1f40f93: Pass ClipData in media capture Intent.Ben Murdoch2014-09-231-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '3ebf713437e5ff2c26ab9c229042eb7274b0917a': Pass ClipData in media capture Intent.
| * | | | | | am a1f40f93: Pass ClipData in media capture Intent.Ben Murdoch2014-09-221-1/+6
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit 'a1f40f93fc1eb046a06683cafc62205a7ec6ca0c': Pass ClipData in media capture Intent.
| | * | | | | Pass ClipData in media capture Intent.Ben Murdoch2014-09-221-1/+6
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary to ensure that the capture application has permission to read the URI that we are asking it to save the capture media into. Bug: 17524075 Change-Id: I6337e58f2610005fb22525e9ae45b037e9832db0
* | | | | | am 3bb937ae: am 481681a1: Using .jpg as suffix of the temporay file for camera.Tao Bai2014-09-191-22/+21
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '3bb937ae73aaed57495459c98df90370739ee272': Using .jpg as suffix of the temporay file for camera.
| * | | | | am 481681a1: Using .jpg as suffix of the temporay file for camera.Tao Bai2014-09-191-22/+21
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | | * commit '481681a1d37ea51a6b1ee53600efeb5013666c58': Using .jpg as suffix of the temporay file for camera.
| | * | | Using .jpg as suffix of the temporay file for camera.Tao Bai2014-09-181-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, change to use the returned file from camcorder. Because the site might rely on the suffix to know the selected file type. BUG:17524075 Change-Id: I7b393d825b5dd11c47337de1feb7d0307fee96d7
* | | | | am 47b65355: am 2e72708a: am 934dfe52: Accept third party cookies if cookie ↵Tao Bai2014-09-133-0/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | setting is enabled by user * commit '47b65355430a20e78a439c16ab95fc2fd457f42f': Accept third party cookies if cookie setting is enabled by user
| * | | | am 2e72708a: am 934dfe52: Accept third party cookies if cookie setting is ↵Tao Bai2014-09-133-0/+16
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | enabled by user * commit '2e72708a8930ea49a56583cad4b12ae4a5ebb66a': Accept third party cookies if cookie setting is enabled by user
| | * | | am 934dfe52: Accept third party cookies if cookie setting is enabled by userTao Bai2014-09-123-0/+16
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '934dfe5246cd151ffd60eb6277088f58f657b81c': Accept third party cookies if cookie setting is enabled by user
| | | * | Accept third party cookies if cookie setting is enabled by userTao Bai2014-09-123-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | BUG:17474704 Change-Id: I8f9f17887cf65c1c5465b576dcf094784266b15b
* | | | | am c232a00c: am 2979e786: am 126b5b3a: Adapt AOSP browser to use the revised ↵Tao Bai2014-09-110-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | createIntent() API * commit 'c232a00c54d59947bd2dcd32767fbc0615ea33a3': Adapt AOSP browser to use the revised createIntent() API
| * | | | am 2979e786: am 126b5b3a: Adapt AOSP browser to use the revised ↵Tao Bai2014-09-103-7/+139
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | createIntent() API * commit '2979e7861f4fd053dce21ef50ed65605537479e7': Adapt AOSP browser to use the revised createIntent() API
| | * | | am 126b5b3a: Adapt AOSP browser to use the revised createIntent() APITao Bai2014-09-103-7/+139
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '126b5b3a771fbcf1a4acd1700c8cfa22975f22df': Adapt AOSP browser to use the revised createIntent() API
| | | * | Adapt AOSP browser to use the revised createIntent() APITao Bai2014-09-103-7/+139
| | | | | | | | | | | | | | | | | | | | | | | | | BUG:17253647,16624450 Change-Id: I0b58d945564923c4ed0fc9377a3f6267d8080c2f
* | | | | Adapt AOSP browser to use the revised createIntent() APITao Bai2014-09-103-7/+139
| | | | | | | | | | | | | | | | | | | | | | | | | BUG:17253647,16624450 Change-Id: I0b58d945564923c4ed0fc9377a3f6267d8080c2f
* | | | | am cc5e753b: am 4e22cd8d: am 4b9f5130: Merge "Update AOSP browser to use the ↵Selim Gurun2014-07-242-168/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | new FileChooser API" into lmp-dev * commit 'cc5e753b9b3486222f87a2da4f8a8d34cfaff316': Update AOSP browser to use the new FileChooser API
| * | | | am 4e22cd8d: am 4b9f5130: Merge "Update AOSP browser to use the new ↵Selim Gurun2014-07-242-168/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | FileChooser API" into lmp-dev * commit '4e22cd8d94235a273e0ea3da15bc7aa82c76ef99': Update AOSP browser to use the new FileChooser API
| | * | | am 4b9f5130: Merge "Update AOSP browser to use the new FileChooser API" into ↵Selim Gurun2014-07-242-168/+9
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '4b9f51307eb0d65063728ab7ae2d52e9dc5bd2ab': Update AOSP browser to use the new FileChooser API
| | | * | Merge "Update AOSP browser to use the new FileChooser API" into lmp-devSelim Gurun2014-07-242-168/+9
| | | |\ \
| | | | * | Update AOSP browser to use the new FileChooser APISelim Gurun2014-07-242-168/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16403458 The file chooser API has changed based on the suggestion from API council. Reflect the changes here. Change-Id: I4398e3659f19623496c1fcdcd0b177f2c1b39b2d
* | | | | | am 424cbde9: (-s ours) am 74145bb1: (-s ours) am 762e4d26: (-s ours) Import ↵Baligh Uddin2014-07-240-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '424cbde960e915d8e46f04cfcf81a7665fbaf710': Import translations. DO NOT MERGE
| * | | | | am 74145bb1: (-s ours) am 762e4d26: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-240-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | * commit '74145bb1c570684db10af578b8d838ffe8d2e5db': Import translations. DO NOT MERGE
| | * | | am 762e4d26: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-240-0/+0
| | |\ \ \ | |/ / / / | | | _ / | | | / | | | | * commit '762e4d2693371fb68c5504cda5f1adceb80c4186': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-07-2350-50/+50
| |/ / | | | | | | | | | | | | Change-Id: I526846bda8f5494f5b81cbf46f63b0ba7e5690bc Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-07-2350-50/+50
| | | | | | | | | | | | | | | Change-Id: I0f9bae88443f23b94a9fbda043a32c33c27f142b Auto-generated-cl: translation import
* | | am 9971e3f4: Changes correspoding to Permission API changeTao Bai2014-07-232-8/+10
|\ \ \ | |/ / | | | | | | | | | * commit '9971e3f4bad925e87fc7c4bd82a7e6b097ce3981': Changes correspoding to Permission API change
| * | Changes correspoding to Permission API changeTao Bai2014-07-222-8/+10
| | | | | | | | | | | | | | | BUG: 15432556 Change-Id: I23fccf2e3e04b8f4ebab566a456c2373269257c2
* | | am 993d8385: (-s ours) Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-210-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '993d83854c449a6959ecf932131a04b0d575ad49': Remove deprecated locales - DO NOT MERGE
| * | Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-192-1042/+0
| | | | | | | | | | | | Change-Id: I91d1e9e41fb255c09a5b6ee80d4e7d5c4ed71eab
* | | Remove deprecated localesBaligh Uddin2014-07-172-1042/+0
|/ / | | | | | | Change-Id: Ibebeef1997f143f4246dea1fffb5cac62fd49e7b
* | Call setShader after setLocalMatrix.Leon Scroggins III2014-07-091-1/+3
| | | | | | | | | | | | | | This ensures the Paint is updated. BUG:14315916 Change-Id: If24080eaea48a12e5897ca085d9ce76b34d28f48
* | Import translations. DO NOT MERGEBaligh Uddin2014-07-051-0/+423
| | | | | | | | | | Change-Id: Id9b0fdc1a057b05437d9dfc987dbbda441929434 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2014-06-291-0/+423
| | | | | | | | | | Change-Id: I00e7cb6ac70ce59baf07893e5d823dc535111c7a Auto-generated-cl: translation import
* | Modify AOSP browser to take advantage of new filechooser API.Selim Gurun2014-06-185-58/+42
| | | | | | | | | | Bug: 6930981 Change-Id: Id73512cd6e859ea9316f02e8f0d973b6e15d969b
* | Merge "Add MODIFY_AUDIO_SETTINGS permission for WebRTC."Tao Bai2014-05-221-0/+1
|\ \
| * | Add MODIFY_AUDIO_SETTINGS permission for WebRTC.Tao Bai2014-05-221-0/+1
| | | | | | | | | | | | | | | | | | BUG: 15074078 Change-Id: If88a1b01406cc4f9d45ea6403be4098d8850baac
* | | Import translations. DO NOT MERGEBaligh Uddin2014-05-2050-0/+700
|/ / | | | | | | | | Change-Id: I878dd9585731edc6959edb47643b111d25045ade Auto-generated-cl: translation import
* | Merge "Move Browser-only files to Browser package"Selim Gurun2014-05-163-2/+99
|\ \
| * | Move Browser-only files to Browser packageSelim Gurun2014-05-153-2/+99
| | | | | | | | | | | | | | | Bug: 11231013 Change-Id: I2e019adf57464021011ee28d6865e709de43051f
* | | Fix permission related issuesTao Bai2014-05-152-8/+7
|/ / | | | | | | | | | | | | - Hide the 'remember' TextView. - Correctly display permission combination. Change-Id: I7242413519d827eada96a692c8a7db3e89eccae4
* | Merge "Use general permission API."Tao Bai2014-05-146-0/+258
|\ \
| * | Use general permission API.Tao Bai2014-05-146-0/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Geolocation related code is untouched. PermissionsPrompt is almost same as GeolocationPermissionPrompt, except - Remember checkbox is hidden as we don't has this feature in framework now. - The resource name is appended according the request. - Remove toast. BUG: 13699047 Change-Id: I1f3f1908bf9c7131ecf2d060fc79d3e5c8842f94
* | | am 0e867eb9: am fe408351: am ac497b63: Merge "Fix Incognito mode crash in ↵John Reck2014-05-133-13/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | AOSP browser" * commit '0e867eb98c456248bd2a1e121c6d8e096ec69c35': Fix Incognito mode crash in AOSP browser