summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-01-17am e5188530: am 9f99f739: am d2391b49: Further tighten the files that the ↵jb-mr1.1-devSelim Gurun
browser can show * commit 'e5188530ca3684a5fde14ffea72c6be105381e1e': Further tighten the files that the browser can show
2014-01-17am 9f99f739: am d2391b49: Further tighten the files that the browser can showjb-mr1-devSelim Gurun
* commit '9f99f739ccfb72f3e6a3c2e0ebb75b8922ed0b31': Further tighten the files that the browser can show
2014-01-17am d2391b49: Further tighten the files that the browser can showSelim Gurun
* commit 'd2391b492dec778452238bc6d9d549d56d41c107': Further tighten the files that the browser can show
2014-01-17Further tighten the files that the browser can showandroid-cts-4.1_r4jb-devSelim Gurun
Bug: 11516871 Change-Id: I46088ed5f668a484df33bb8458ebf687f1aa70d9
2014-01-16am fe7dc301: am 45507172: am 0bc1ffaa: Merge "DO NOT MERGE Convert the ↵Selim Gurun
scheme to lowercase" into jb-dev * commit 'fe7dc301832b83c082414ce217df2b351b00d430': DO NOT MERGE Convert the scheme to lowercase
2014-01-16am 45507172: am 0bc1ffaa: Merge "DO NOT MERGE Convert the scheme to ↵Selim Gurun
lowercase" into jb-dev * commit '45507172eb7a784cf1289c09e66ba92b07feae23': DO NOT MERGE Convert the scheme to lowercase
2014-01-16am a36781e0: Merge "DO NOT MERGE Convert the scheme to lowercase" into ↵Selim Gurun
jb-mr1-dev * commit 'a36781e0940651e0a0f20d003f727793178020a8': DO NOT MERGE Convert the scheme to lowercase
2014-01-16am 0bc1ffaa: Merge "DO NOT MERGE Convert the scheme to lowercase" into jb-devSelim Gurun
* commit '0bc1ffaa383afaf88e9049a3610b2da90b9f0070': DO NOT MERGE Convert the scheme to lowercase
2014-01-16Merge "DO NOT MERGE Convert the scheme to lowercase" into jb-mr1-devSelim Gurun
2014-01-16Merge "DO NOT MERGE Convert the scheme to lowercase" into jb-devSelim Gurun
2014-01-15am f8c18437: am 699496ca: am 6243e7cb: Restrict loading private browser filesSelim Gurun
* commit 'f8c1843783a5bc8b0b5198e695bad96e9595d921': Restrict loading private browser files
2014-01-15am 699496ca: am 6243e7cb: Restrict loading private browser filesSelim Gurun
* commit '699496ca7b8bc7ef2727a6681eb95aa8ac78e59b': Restrict loading private browser files
2014-01-15am 6243e7cb: Restrict loading private browser filesSelim Gurun
* commit '6243e7cb0eb836af28b23a2e00d89627b90496e4': Restrict loading private browser files
2014-01-16DO NOT MERGE Convert the scheme to lowercaseSelim Gurun
Bug: 9793586 This is to fix a bug in I8f6f03b05556ee4d6846c15752de9be54c003060. Change-Id: I643fb1b0730e1e6b391c9c5af69cf7b86cbcdfe5
2014-01-15DO NOT MERGE Convert the scheme to lowercaseSelim Gurun
Bug: 9793586 This is to fix a bug in I8f6f03b05556ee4d6846c15752de9be54c003060. Change-Id: I643fb1b0730e1e6b391c9c5af69cf7b86cbcdfe5
2014-01-15Restrict loading private browser filesSelim Gurun
Bug:11516871 Change-Id: I6a717a157f3d29edfffc36dc2da45c6df30d6ccd
2014-01-15am 05288bbc: am f18f8ac4: am 7719d6ca: DO NOT MERGE Do not let intents ↵Selim Gurun
request viewing private browser files * commit '05288bbcba86cdf453e0eef9dacd2a076d079680': DO NOT MERGE Do not let intents request viewing private browser files
2014-01-15am f18f8ac4: am 7719d6ca: DO NOT MERGE Do not let intents request viewing ↵Selim Gurun
private browser files * commit 'f18f8ac477f11dab503fc57c1fac122daa361ec0': DO NOT MERGE Do not let intents request viewing private browser files
2014-01-15am 816688be: DO NOT MERGE Do not let intents request viewing private browser ↵Selim Gurun
files * commit '816688be5d55974d05fb1dddac784bb36e0296bd': DO NOT MERGE Do not let intents request viewing private browser files
2014-01-15am 7719d6ca: DO NOT MERGE Do not let intents request viewing private browser ↵Selim Gurun
files * commit '7719d6ca3fd4079add8a9648838d99244a237eaf': DO NOT MERGE Do not let intents request viewing private browser files
2014-01-11DO NOT MERGE Do not let intents request viewing private browser filesSelim Gurun
Bug: 9793586 Change-Id: I8f6f03b05556ee4d6846c15752de9be54c003060 (cherry picked from commit 348cca6c61e1ad3f2d580298d9ec5f1826f64269)
2014-01-11DO NOT MERGE Do not let intents request viewing private browser filesSelim Gurun
Bug: 9793586 Change-Id: I8f6f03b05556ee4d6846c15752de9be54c003060 (cherry picked from commit 348cca6c61e1ad3f2d580298d9ec5f1826f64269)
2012-11-29am 7c1000f6: Import translations. DO NOT MERGEandroid-cts-4.2_r2android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1jb-mr1.1-releaseBaligh Uddin
* commit '7c1000f6fc1ee0c62fafe70830a3d28d0e08aaa4': Import translations. DO NOT MERGE
2012-11-29Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Ie8d352f307e9881655335b0591e28829e343fc5c Auto-generated-cl: translation import
2012-11-29Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I46c1c51f10fd044690a40a97199f540d93d3df4f Auto-generated-cl: translation import
2012-10-17am 6c96757f: (-s ours) Import translations. DO NOT MERGEandroid-sdk-support_r11android-cts-4.2_r1android-4.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1-releaseBaligh Uddin
* commit '6c96757f6f39c8c52a248da638e30d3f9b1f3cd5': Import translations. DO NOT MERGE
2012-10-16Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I5e59077f65e24df2e6706dd0ec7874599f15f5d4 Auto-generated-cl: translation import
2012-10-15Let's enhanceJason Chen
Add mipmap-xxhdpi launcher icon asset for Browser. Not adding a bookmark shortcut asset for now, as we can fall back to the mipmap-xhdpi version. Also remove obsolete drawable-*/ic_launcher_shortcut_browser_bookmark files. Bug: 6718166 Change-Id: Iaf2da67b0574a1004b250a716a1e755450540533
2012-10-04Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Iec9925a7f238faffbf4913cf9835d8c00b7450d9 Auto-generated-cl: translation import
2012-10-03Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I311ad114b05e3301db648cbf950d828323b04842 Auto-generated-cl: translation import
2012-09-27Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I7e116ad64ebe02f6aa48f085516f89d28ac22087 Auto-generated-cl: translation import
2012-09-26Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I145eaefcc9bc20ce4bf6a0dc1b912aaf8d8ab8ae Auto-generated-cl: translation import
2012-09-25Import translations. DO NOT MERGEBaligh Uddin
Change-Id: If820a8203ef8202fe298f58a450f22677393d3ed Auto-generated-cl: translation import
2012-09-24Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Ica0f705e5b5d7c85a239edd9a3c3e55786d92b48 Auto-generated-cl: translation import
2012-09-22Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Icf6f5dca84be0393f6a981dd202b4d4e28ba821a Auto-generated-cl: translation import
2012-09-21Merge "Add contentDescription to SnapshotBar" into jb-mr1-devJohn Reck
2012-09-21Add contentDescription to SnapshotBarJohn Reck
Bug: 6806099 Change-Id: I80404aca29b0e9897210d8f57c696e5a7e8e1c2f
2012-09-21Merge "Add contentDescription for page info" into jb-mr1-devJohn Reck
2012-09-21Add contentDescription for page infoJohn Reck
Bug: 6806384 Change-Id: Ib009a345d2dcaf5630864e8087e12194d213e174
2012-09-21Merge "Add missing contentDescription" into jb-mr1-devJohn Reck
2012-09-21Add missing contentDescriptionJohn Reck
Bug: 6938839 Change-Id: I964ce0ffb47e9fcfb93f61edfc0e53c160d9e818
2012-09-21Add content description for folder upJohn Reck
Bug: 6940202 Change-Id: I6b8c53285606fdcf6495a4ccf3c94a2037c8979b
2012-09-18am 81cb2d18: Merge "Don\'t replace file extension when mime-type is incorrect"John Reck
* commit '81cb2d1800a0a0aced83225f7f923b0809211001': Don't replace file extension when mime-type is incorrect
2012-09-18Merge "Don't replace file extension when mime-type is incorrect"John Reck
2012-09-14Don't replace file extension when mime-type is incorrectMagnus Hallqvist
When downloading content from a server that claims content to be text/plain or application/octet-stream a guess is made of the proper mime-type from a possible "file-extension" in the URL. When creating the filename of the downloaded content any file extension that does not match the mime-type is replaced with one derived from the mime-type (.txt for text/plain, none for application/octet-stream). However the guessed mime-type is not used in the filename creation, so content with a proper file extension but a text/plain mime-type will have its file extension replaced with .txt derived from the incorrect mime-type. This fix will use the guessed mime-type when creating the filename to avoid replacing a correct file extension. Change-Id: I5df642e94948914708af99a4d902b253ac8a48dd
2012-09-13am b7ee3b51: Merge "BrowserSettings required a Controller sometimes"John Reck
* commit 'b7ee3b51919842cd26eb865d28cd9ce8e3ba5a2e': BrowserSettings required a Controller sometimes
2012-09-13Merge "BrowserSettings required a Controller sometimes"John Reck
2012-09-13BrowserSettings required a Controller sometimesMagnus Hallqvist
BrowserSettings can be used without a browser Controller, e.g. when accessed from system settings. But some null checks for this case were missing, these have now been added. Change-Id: I57762898d34ef3018569e0de1499be2922dabded
2012-09-11Deleted code that relies on defunct SearchBox interface.Selim Gurun
Change-Id: I831890524acb4e38078053d504c3ada468eca686
2012-09-06am d22af61d: Merge "Added catch of SQLiteException when updating screenshot"John Reck
* commit 'd22af61d97b938d0c4124fbdaae627f3e85e7084': Added catch of SQLiteException when updating screenshot