summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-262-8/+8
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I145eaefcc9bc20ce4bf6a0dc1b912aaf8d8ab8ae Auto-generated-cl: translation import
* | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-262-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8cac81af300d43cf454715db0e808985cfc26477 Auto-generated-cl: translation import
* | | | | | | | am 98b9cb5d: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-09-250-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '98b9cb5d09856d62439a28f00c82be400d96090b': Import translations. DO NOT MERGE
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-2521-42/+21
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If820a8203ef8202fe298f58a450f22677393d3ed Auto-generated-cl: translation import
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-2521-42/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b0572d1b53242fecad852de5f86f699e3f04fac Auto-generated-cl: translation import
* | | | | | | am 1a6bacc7: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-09-240-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '1a6bacc752a059eca1d6751f64e725c6e121a2b8': Import translations. DO NOT MERGE
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-2427-55/+28
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: Ica0f705e5b5d7c85a239edd9a3c3e55786d92b48 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-2449-1/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ife2e7422ab9efe54b0761207a0aca21b92bf436e Auto-generated-cl: translation import
* | | | | | am 1ce43bf9: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-09-240-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '1ce43bf97e5d0377d4d5332e6da5620d7e70078e': Import translations. DO NOT MERGE
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-2249-26/+123
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Change-Id: Icf6f5dca84be0393f6a981dd202b4d4e28ba821a Auto-generated-cl: translation import
* | | | | am bbbadfa2: Merge "Add contentDescription to SnapshotBar" into jb-mr1-devJohn Reck2012-09-242-8/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'bbbadfa261663c33e77db930f6e03ef704a1eefe': Add contentDescription to SnapshotBar
| * | | | Merge "Add contentDescription to SnapshotBar" into jb-mr1-devJohn Reck2012-09-212-8/+9
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add contentDescription to SnapshotBarJohn Reck2012-09-212-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6806099 Change-Id: I80404aca29b0e9897210d8f57c696e5a7e8e1c2f
* | | | | am ebfd289d: Merge "Add contentDescription for page info" into jb-mr1-devJohn Reck2012-09-241-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ebfd289d99b07beaf92378a36596984f56692f30': Add contentDescription for page info
| * | | | Merge "Add contentDescription for page info" into jb-mr1-devJohn Reck2012-09-211-0/+1
| |\ \ \ \
| | * | | | Add contentDescription for page infoJohn Reck2012-09-211-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6806384 Change-Id: Ib009a345d2dcaf5630864e8087e12194d213e174
* | | | | am eebafd1e: Merge "Add missing contentDescription" into jb-mr1-devJohn Reck2012-09-241-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'eebafd1ed09706594861805e627cc1dd53348ec1': Add missing contentDescription
| * | | | Merge "Add missing contentDescription" into jb-mr1-devJohn Reck2012-09-211-0/+1
| |\ \ \ \
| | * | | | Add missing contentDescriptionJohn Reck2012-09-211-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6938839 Change-Id: I964ce0ffb47e9fcfb93f61edfc0e53c160d9e818
* | | | | am aac2ce07: Add content description for folder upJohn Reck2012-09-242-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'aac2ce07604daea0315b6caba6d286fb4cb34365': Add content description for folder up
| * | | | Add content description for folder upJohn Reck2012-09-212-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 6940202 Change-Id: I6b8c53285606fdcf6495a4ccf3c94a2037c8979b
* | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-211-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I2eb6a6f3ce6cc40c36e31275414e935c80486145 Auto-generated-cl: translation import
* | | | am fb20f277: am 81cb2d18: Merge "Don\'t replace file extension when ↵John Reck2012-09-181-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | mime-type is incorrect" * commit 'fb20f2773fc1bb71fe6f3a691fbc66e2775d29a0': Don't replace file extension when mime-type is incorrect
| * | | am 81cb2d18: Merge "Don\'t replace file extension when mime-type is incorrect"John Reck2012-09-181-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '81cb2d1800a0a0aced83225f7f923b0809211001': Don't replace file extension when mime-type is incorrect
| | * | Merge "Don't replace file extension when mime-type is incorrect"John Reck2012-09-181-0/+1
| | |\ \
| | | * | Don't replace file extension when mime-type is incorrectMagnus Hallqvist2012-09-141-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-09-131-2/+2
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I69571d9c49cb8db4db4ca55246270773b33811da Auto-generated-cl: translation import
* | | | | am 700142f6: am b7ee3b51: Merge "BrowserSettings required a Controller ↵John Reck2012-09-131-2/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | sometimes" * commit '700142f66bf8f8f14ed25a6a9f67f6c1f44a3dbc': BrowserSettings required a Controller sometimes
| * | | am b7ee3b51: Merge "BrowserSettings required a Controller sometimes"John Reck2012-09-131-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'b7ee3b51919842cd26eb865d28cd9ce8e3ba5a2e': BrowserSettings required a Controller sometimes
| | * | Merge "BrowserSettings required a Controller sometimes"John Reck2012-09-131-2/+2
| | |\ \
| | | * | BrowserSettings required a Controller sometimesMagnus Hallqvist2012-09-131-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 70c7844f: Deleted code that relies on defunct SearchBox interface.Selim Gurun2012-09-121-70/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '70c7844ff0156926dfa58896c911de71982bd638': Deleted code that relies on defunct SearchBox interface.
| * | | Deleted code that relies on defunct SearchBox interface.Selim Gurun2012-09-111-70/+2
| | | | | | | | | | | | | | | | Change-Id: I831890524acb4e38078053d504c3ada468eca686
* | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-101-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I8b3a64bf4a37e2a7ab217ee7e74849586d607bb4 Auto-generated-cl: translation import
* | | | am 34c8499c: am d22af61d: Merge "Added catch of SQLiteException when ↵John Reck2012-09-061-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | updating screenshot" * commit '34c8499cc0fadea73233b0bd8e33f26811972ad1': Added catch of SQLiteException when updating screenshot
| * | | am d22af61d: Merge "Added catch of SQLiteException when updating screenshot"John Reck2012-09-061-0/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'd22af61d97b938d0c4124fbdaae627f3e85e7084': Added catch of SQLiteException when updating screenshot
| | * | Merge "Added catch of SQLiteException when updating screenshot"John Reck2012-09-061-0/+5
| | |\ \
| | | * | Added catch of SQLiteException when updating screenshotMattias Nilsson2012-09-061-0/+5
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error found when running Monkey test. User probably tries to add a bookmark and directly after deleting it. The method updateScreenshot is running an AsyncTask and gets an Exception from the database when the bookmark does not exist. The deletion of the bookmark runs in another thread. Change-Id: I63bb954419f60fb5106c1a6597692b6bac925714
* | | | am e9caeafa: am 1fce2b5d: Merge "Reset to default did not reset cached settings"John Reck2012-09-051-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e9caeafa9a953be0cbe974043920d72cec9ddf22': Reset to default did not reset cached settings
| * | | am 1fce2b5d: Merge "Reset to default did not reset cached settings"John Reck2012-09-051-0/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '1fce2b5dc32712cb5c6e301844a736da5d4aa848': Reset to default did not reset cached settings
| | * | Merge "Reset to default did not reset cached settings"John Reck2012-09-051-0/+5
| | |\ \
| | | * | Reset to default did not reset cached settingsBjörn Isaksson2012-09-051-0/+5
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some settings such as the current search engine to use was cached in the BrowserSetting object and not always read from shared preferences. When settings were reset to default these cached values were not reset causing the old (possibly non-default) value to still be used. Change-Id: I805a339a6238c96dc73cbda47981053bd4f6eace
* | | | am 31b62c4c: Merge "Use a fixed title bar if accessibility is enabled" into ↵John Reck2012-09-042-0/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '31b62c4c83cc6f2909731bd80cc75910cc7f3b8b': Use a fixed title bar if accessibility is enabled
| * | | Merge "Use a fixed title bar if accessibility is enabled" into jb-mr1-devJohn Reck2012-09-042-0/+9
| |\ \ \
| | * | | Use a fixed title bar if accessibility is enabledJohn Reck2012-09-042-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6940152 Change-Id: Id6f694d8334a7c50f2e6f6c481bbb3cff847860f
* | | | | am a05bb145: am 922afab3: Merge "No search pane while tapping search button ↵John Reck2012-09-041-0/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | after backing to "windows" view from "saved page" view." * commit 'a05bb14549f6d7d3042739466a015c53ad910bd0': No search pane while tapping search button after backing to "windows" view from "saved page" view.
| * | | | am 922afab3: Merge "No search pane while tapping search button after backing ↵John Reck2012-09-041-0/+11
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | to "windows" view from "saved page" view." * commit '922afab3f6044ff38c78d1d991c74ca003f90302': No search pane while tapping search button after backing to "windows" view from "saved page" view.
| | * | | Merge "No search pane while tapping search button after backing to "windows" ↵John Reck2012-09-041-0/+11
| | |\ \ \ | | | | | | | | | | | | | | | | | | view from "saved page" view."
| | | * | | No search pane while tapping search button after backing to "windows" view ↵yijunx.zhu2012-08-211-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from "saved page" view. When NavScreen is showing, the active tab should be detached normally, but tab is reattached after backing to NavScreen from other activity. Do the detach again. Change-Id: I1b30791285a0ff08c69924d74a0f1660212995f2 Author: Weiwei Ji <weiweix.ji@intel.com> Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 28528
generated by cgit v1.1 at 2025-09-15 10:13:42 +0000