summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* am 5818811e: Merge "Improve content notifications" into ics-mr0John Reck2011-10-172-8/+54
|\ | | | | | | | | * commit '5818811e40d0e5805fcf68ce3117b258b2b4591d': Improve content notifications
| * Improve content notificationsJohn Reck2011-10-172-8/+54
| | | | | | | | | | | | | | | | Bug: 5465258 Restrict when we set syncToNetwork and clean up unnecessary notifications Change-Id: I19b6d2b3df6fd70ac3a1b386137ce67d371323e4
* | am fc853325: Merge "HTML escape most visited" into ics-mr0John Reck2011-10-171-10/+15
|\ \ | |/ | | | | | | * commit 'fc853325e9a170fb21648b939d859a46aca3bb1e': HTML escape most visited
| * HTML escape most visitedJohn Reck2011-10-171-10/+15
| | | | | | | | | | | | Bug: 5471514 Change-Id: Ie3f175cc8ef9fd6e66ee6ced7a0cd383e04458e2
* | Fix use of WebView.loadData() to avoid passing invalid encodingSteve Block2011-10-172-2/+2
| | | | | | | | | | | | | | No change in behavior, as invalid encodings have always been ignored. Bug: 5125738 Change-Id: I521bec1acc5aae17972c16a49424631b93933ea6
* | am 4ec6e1e5: Merge "Expand scope of try/catch" into ics-mr0John Reck2011-10-131-5/+3
|\ \ | |/ | | | | | | * commit '4ec6e1e521951a3b3d521a20122ba7100dbd6cc8': Expand scope of try/catch
| * Merge "Expand scope of try/catch" into ics-mr0John Reck2011-10-131-5/+3
| |\
| | * Expand scope of try/catchJohn Reck2011-10-131-5/+3
| | | | | | | | | | | | | | | | | | Bug: 5458165 Change-Id: I6e2ca495189179086e313e0ed61217649a9b1e8a
* | | am 1024c176: Merge "Add null check" into ics-mr0John Reck2011-10-131-0/+3
|\ \ \ | |/ / | | | | | | | | | * commit '1024c1765e892432975510dddc784c1360975247': Add null check
| * | Merge "Add null check" into ics-mr0John Reck2011-10-131-0/+3
| |\ \
| | * | Add null checkJohn Reck2011-10-131-0/+3
| | |/ | | | | | | | | | | | | | | | Bug: 5452795 Change-Id: I8b43875e0e72665384c974c502d8f38946f0c6f1
* | | am 315d502e: Reduce size of menusMichael Kolb2011-10-139-35/+56
|\ \ \ | |/ / | | | | | | | | | * commit '315d502edce27bb4e93e53134f1a43b8f5c45588': Reduce size of menus
| * | Reduce size of menusMichael Kolb2011-10-139-35/+56
| | | | | | | | | | | | | | | | | | Bug: 5452031 Change-Id: I3cc638b981e50796293b0f61dac2d93b8e3df1a0
* | | am 82f00179: Merge "Drop all snapshots for Skia change" into ics-mr0John Reck2011-10-131-2/+5
|\ \ \ | |/ / | | | | | | | | | * commit '82f00179fa70ecd0d9fe25f4182d5db8986c11d2': Drop all snapshots for Skia change
| * | Merge "Drop all snapshots for Skia change" into ics-mr0John Reck2011-10-131-2/+5
| |\ \ | | |/ | |/|
| | * Drop all snapshots for Skia changeJohn Reck2011-10-121-2/+5
| | | | | | | | | | | | | | | | | | Bug: 5388379 Change-Id: Ie41ea6d55f987033c052c87a5a6171a678e09d4f
* | | am 132eedfc: Merge "Add setting for configuring zoom level on double-tap." ↵Mangesh Ghiware2011-10-133-0/+38
|\ \ \ | |/ / | | | | | | | | | | | | | | | into ics-mr0 * commit '132eedfc1cf97456cf03d55968bed4bc9e4eb817': Add setting for configuring zoom level on double-tap.
| * | Merge "Add setting for configuring zoom level on double-tap." into ics-mr0Mangesh Ghiware2011-10-133-0/+38
| |\ \ | | |/ | |/|
| | * Add setting for configuring zoom level on double-tap.Mangesh Ghiware2011-10-123-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added a seek bar in Accessibility settings to configure the zoom level on double-tap. The range is 75-125% with the default of 100% equal to the display density. Bug: 5312461 Change-Id: Iaf1b9f6f6659146db4031c5f819ef9cb55695b5c
* | | Merge "Fix Monkey NullPointerException in data URLs."George Mount2011-10-121-2/+5
|\ \ \
| * | | Fix Monkey NullPointerException in data URLs.George Mount2011-10-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5442979 Fixed assumption that tab would not be null in previous change to disable bookmarking data URLs on phones. Change-Id: I54601e940bd2bf865a4f5a22517a92144bcf7e96
* | | | am 4e11a856: Merge "Lower snapshot size limit" into ics-mr0John Reck2011-10-123-9/+13
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '4e11a85649bf1b7b44af910ff68f2e9188896c2f': Lower snapshot size limit
| * | | Merge "Lower snapshot size limit" into ics-mr0John Reck2011-10-123-9/+13
| |\ \ \
| | * | | Lower snapshot size limitJohn Reck2011-10-123-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5443747 Also catch more exceptions Change-Id: I5273c025d9fd8b7278587d6be44bf66fac4dfcde
| * | | | DO NOT MERGE Fix Monkey NullPointerException in data URLs.George Mount2011-10-121-2/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5442979 Fixed assumption that tab would not be null in previous change to disable bookmarking data URLs on phones. Change-Id: I9f032d165d0693a66a0595c33d598b14290dc974
* | | | am ce8bcb0d: Reset animation stateJohn Reck2011-10-111-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ce8bcb0d8fff390451e9c95acd89cc2bbe0f66f7': Reset animation state
| * | | Reset animation stateJohn Reck2011-10-111-0/+6
| | |/ | |/| | | | | | | | | | | | | Bug: 5444751 Change-Id: I1a053cf13f0f01d1f8b1ece2d9abe5efb605273d
* | | Merge "fix reduce log spam on errors"Selim Gurun2011-10-111-4/+4
|\ \ \
| * | | fix reduce log spam on errorsSelim Gurun2011-10-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5415103 Excluding common error cases from logging. Change-Id: Id573ccb8563d3e7d8fb6ff76cd803447731c81a3
* | | | Remove confirmation dialog titlesJohn Reck2011-10-114-7/+0
| |/ / |/| | | | | | | | | | | | | | | | | Bug: 5398629 Also removed some unused strings and resources Change-Id: I2db180d3f9ad55d1eff5bccc6fe19fac01e15b07
* | | Merge "Fix crash with qc" into ics-mr0John Reck2011-10-113-15/+20
|\ \ \
| * | | Fix crash with qcJohn Reck2011-10-113-15/+20
| | |/ | |/| | | | | | | | | | | | | Bug: 5439827 Change-Id: Ic561a5c7689410dd917e01c27e9b454a8722f957
* | | Fix intent handling from other apps in recovery caseMichael Kolb2011-10-112-6/+7
|/ / | | | | | | | | | | | | | | | | Bug: 5433940 When browser had a crash recovery state, the view intent from the other app was dropped. Change-Id: I8eaafa7ad792fa2048ad33886b7394c31ca97e21
* | Merge "Return history/bookmarks from BrowserProvider."Mark Brophy2011-10-111-33/+34
|\ \
| * | Return history/bookmarks from BrowserProvider.Mark Brophy2011-10-111-33/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the global-search query to the browser return the history table joined with the bookmarks table. This way, bookmarks in the history will have the correct icon set. Note: Since we're doing a left join of history with bookmarks, this means we won't show bookmarks which haven't been visited, something we consider a feature. 8) Bug: 5370935 Change-Id: I0068432ca1a8ef78f27b7a84eb7be3be56eae644
* | | Merge "When a page's main resource uses an invalid SSL certificate, reflect ↵Steve Block2011-10-112-7/+23
|\ \ \ | |_|/ |/| | | | | this in 'Page Info'"
| * | When a page's main resource uses an invalid SSL certificate, reflect this in ↵Steve Block2011-10-102-7/+23
| |/ | | | | | | | | | | | | | | | | | | | | | | 'Page Info' This requires us to keep track of the SslError, if present, for the main resource. Also remove some superfluous initializations. Bug: 5248376 Change-Id: I09b09990c58c8ef10220638ab2b10640692ae801
* | Data URL fixes - bookmarks, save, and wallpaperGeorge Mount2011-10-105-16/+189
| | | | | | | | | | | | | | | | | | Bug 5383517 Images kept in data URLs can now be selected and this fixes the Save and Set Wallpaper options. It also removes the bookmarking capability. Change-Id: I461bdcb4c950f6fcd8db8b38f4c599212106b027
* | Merge "Improve tab switcher open perf"John Reck2011-10-104-15/+49
|\ \ | |/ |/|
| * Improve tab switcher open perfJohn Reck2011-10-074-15/+49
| | | | | | | | | | | | Bug: 5379115 Change-Id: I5e5bfcfead4c54deb49af94de6f6526bd2710567
* | Merge "Refactor generation of SSL certificate dialogs"Steve Block2011-10-101-59/+69
|\ \ | |/ |/|
| * Refactor generation of SSL certificate dialogsSteve Block2011-10-061-59/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The SSL certificate dialog is shown in two cases ... - When an SSL error occurrs when loading a resource - For the 'Page Info' menu option when the main page uses SSL. This change factors out common functionality into a new createSslCertificateDialog() method. It also removes a superfluous check in showPageInfo(). Bug: 5248376 Change-Id: I2ce57b2becfb7e9498f7b955b6e65feeb2fa1c19
* | Merge "Improve navscreen opening performance"John Reck2011-10-073-70/+87
|\ \
| * | Improve navscreen opening performanceJohn Reck2011-10-073-70/+87
| |/ | | | | | | | | | | | | | | | | Bug: 5379115 Cache mNavScreen (expensive to create) Cache AnimScreen (expensive to create) Don't capture a screenshot for an unused parameter Change-Id: I0ac9de647f61222866499ae40c1a946551dad7bb
* | Merge "Refresh origins on resume"John Reck2011-10-071-0/+6
|\ \
| * | Refresh origins on resumeJohn Reck2011-10-071-0/+6
| |/ | | | | | | | | | | Bug: 5352993 Change-Id: I5e131a5ef04fa0b7f77b338d7bfaef56eb8e40ec
* | Show the unlocked padlock icon when there is an SSL authentication problem.Steve Block2011-10-072-8/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces two changes in behaviour ... - If the page's main resource uses SSL but there's a problem with it's certificate, show the open lock icon rather than the closed lock icon. - If the page's main resource uses SSL and the certificate is good, but some sub-resources have problems with their certificates, show the open lock icon rather than the closed lock icon. Previously we would show the open lock icon only if these sub-resources did not use SSL. Requires https://android-git.corp.google.com/g/#/c/139926. Bug: 5403366 Change-Id: I0cb1b26d1180aacfbc500a944421e7b753cd95f1
* | Correct fullscreen video playback for HTML5 videoMichael Kolb2011-10-061-31/+19
|/ | | | | | | | | Bug: 5415790 Changed from window back to a fullscreen layout attached to the decor view Change-Id: I85750e27aa2a953ffc54ee96cc2de4156d52cc5e
* Merge "Allow default preload setting to be configured via Gservices."Mathew Inwood2011-10-062-5/+27
|\
| * Allow default preload setting to be configured via Gservices.Mathew Inwood2011-10-052-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now load the default value from a secure setting. To over-ride it, set Gservices key secure:browser_default_preload_setting to the appropriate value. The Gservices default value will only be used if the user has never opened the 'Bandwidth management' tab in the browswer settings. Once that tab has been opened, even if the user did not change the setting, the value will be persisted in the browser and the default will be ignored. Bug: 5346028 Change-Id: If3b14485dc8bc46e7ed72c49eb5cf3c474893fe3