summaryrefslogtreecommitdiff
path: root/src/com/android/browser/Controller.java
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Crash recover no longer uses icicle."George Mount2011-11-231-47/+58
|\ \
| * | Crash recover no longer uses icicle.George Mount2011-11-231-47/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5508252 Changed load state to use the crash recovery state every time instead of using icicle. When the state is saved, the value is written synchronously. Moved settings from CrashRecoveryHandler to BrowserSettings Change-Id: I1a241d4c488fe3246c7d7f1ee0ce26c42ba29429
* | | am a48621be: Merge "Monkey season" into ics-mr1Michael Kolb2011-11-211-1/+4
|\ \ \ | | |/ | |/| | | | | | | * commit 'a48621be8a537284f37b843388b30017b0cfce51': Monkey season
| * | Merge "Monkey season" into ics-mr1Michael Kolb2011-11-211-1/+4
| |\ \
| | * | Monkey seasonMichael Kolb2011-11-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5650555 Change-Id: Ia5ea323b3abaf411c24af18193d5d9ac7f63e212
* | | | am b1fb70ce: Fix stop/refresh menu stateMichael Kolb2011-11-211-19/+17
|\| | | | |_|/ |/| | | | | | | | * commit 'b1fb70cee9e24f3f9e648dff1816403c427976d1': Fix stop/refresh menu state
| * | Fix stop/refresh menu stateMichael Kolb2011-11-211-19/+17
| |/ | | | | | | | | | | | | | | | | Bug: 5469075 5640775 Reconcile page load status updates to only use tab state; update menus accordingly Change-Id: Id32f1e0486e8439d6729f3657eda1132c25dfc7e
* | am 3e5e5fad: Merge "Remove the psychic labs feature." into ics-mr1Narayan Kamath2011-11-181-6/+0
|\| | | | | | | | | * commit '3e5e5fada69d74bb50b14ef3588e7beadaedfd69': Remove the psychic labs feature.
| * Remove the psychic labs feature.Narayan Kamath2011-11-181-6/+0
| | | | | | | | | | | | | | | | Reverts the UrlInputView to a standard autocomplete that causes less trouble for IMEs. bug:5598837 Change-Id: If469d76f4feda88e4a122264a39d317737404578
* | Show download complete message for data URI downloads.George Mount2011-11-171-1/+1
| | | | | | | | | | | | Bug 5566849 Change-Id: Ifdb9a952a2b0b28d0f34ba11d112ef9b465bf564
* | Merge "Remove dump V8 counters from browser debug menu"Kristian Monsen2011-11-141-7/+0
|\ \ | |/ |/|
| * Remove dump V8 counters from browser debug menuKristian Monsen2011-11-111-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the function from the WebView. This is a private function, and to do anything useful WebCore had to be recompiled with the special ANDROID_INSTRUMENTATION option. Needed by https://android-git.corp.google.com/g/#/c/148912/ There is a bug for fixing ANDROID_INSTRUMENTATION: bug 2816327 Since this has not been used for more than a year, removing this option instead of fixing. Change-Id: Ib5033a377a388d2ab211407aefe4b4932b441b76
* | Handle error condition when inserting snapshotsJohn Reck2011-11-101-0/+8
|/ | | | | | Bug: 5599226 Change-Id: I4429ed965325d908cdc5094c37d856f4d9d68933
* Reduce size of menusMichael Kolb2011-10-131-12/+21
| | | | | | Bug: 5452031 Change-Id: I3cc638b981e50796293b0f61dac2d93b8e3df1a0
* Lower snapshot size limitJohn Reck2011-10-121-1/+5
| | | | | | | Bug: 5443747 Also catch more exceptions Change-Id: I5273c025d9fd8b7278587d6be44bf66fac4dfcde
* Fix intent handling from other apps in recovery caseMichael Kolb2011-10-111-5/+6
| | | | | | | | | Bug: 5433940 When browser had a crash recovery state, the view intent from the other app was dropped. Change-Id: I8eaafa7ad792fa2048ad33886b7394c31ca97e21
* Data URL fixes - bookmarks, save, and wallpaperGeorge Mount2011-10-101-3/+67
| | | | | | | | | 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 "Immediately update title bar when loading a URL"Michael Kolb2011-10-051-0/+1
|\
| * Immediately update title bar when loading a URLMichael Kolb2011-10-051-0/+1
| | | | | | | | | | | | Bug: 5153437 Change-Id: I712c62f15bcb294a0833f526fa27dac88ec15c8e
* | Fix intent handlingJohn Reck2011-10-051-2/+5
|/ | | | | | | | Bug: 5405096 If state != null, don't process the intent in getIntent, it will be stale Change-Id: Icc854a1d8f11fdbd60c1f7f854053f2294864b0f
* Rename Tab.LockIcon to Tab.SecurityStateSteve Block2011-10-031-1/+1
| | | | | | | | | | | | | The tab's state is concerned with whether or not the page is secure. It should not mention the lock icon, as this is just a UI choice of how to represent the security state. Also renames WebViewController.onUpdatedLockIcon() to onUpdatedSecurityState(). No functional change. Bug: 5403366 Change-Id: Id18402e84fd9b1f661c160189c7a19a9352fd25c
* View images without throwing an intentMichael Kolb2011-09-281-2/+8
| | | | | | | | Bug: 5375434 load images directly into a new tab and set parent on the new tab Change-Id: I5b038d30127b6cf3144de4ae38e6f4ab6d9117a5
* Remove network connection error dialogJohn Reck2011-09-191-3/+0
| | | | | | Bug: 5341852 Change-Id: I34028cbfb6fa834624ccb816dda0824504b56028
* Use overlay action modeJohn Reck2011-09-161-17/+0
| | | | | | | | | | | | | | Bug: 5327408 By using actionBar: false with actionModeOverlay: true the action mode callbacks happen before the action mode animation. This allows us to animate down the URL bar at the same time if needed (when the URL is being edited). Overlay mode fixes the issue with webview being translated, which was what caused the selection handles to move. Only the selection handles were affected thanks to b/4982054 Change-Id: I8153de63124eb4e4d02e88637f0cf01658054a14
* Merge "Cleanup menus"John Reck2011-09-151-4/+18
|\
| * Cleanup menusJohn Reck2011-09-141-4/+18
| | | | | | | | | | | | Bug: 5290513 Change-Id: I2ca1de40fe362b74d941056504fc4e3249de03a3
* | Revert "Support for measuring page load times."Mathew Inwood2011-09-151-33/+1
|/ | | | | | | | | | | The page load time measurement was a stop gap measure until server side support is ready, and we don't want to ship with it in. Bug: 5266893 This reverts commit b4e831bf1ff62945199b89a77ad039be7bd16545. Change-Id: Iafc08cea88774e5ecf018112a25e4dc2993a4623
* Use onDraw instead of capturePicture for thumbnailsJohn Reck2011-09-081-31/+35
| | | | | | Bug: 5220344 Change-Id: I78ebbb8ae6c574d79b99fcde8220e5d08342876c
* Merge "Support for measuring page load times."Mathew Inwood2011-09-071-1/+33
|\
| * Support for measuring page load times.Mathew Inwood2011-09-061-1/+33
| | | | | | | | | | | | | | | | | | | | An app can attached a pending intent to an intent sent to the browser which will be send when the load completes. The browser will fill in the timestamp of when the page load completed, and details of preloading success or otherwise if this was used. Bug: 5259031 Change-Id: I2d025caabd6055ac25f06e69897a03d5c57c4f41
* | Monkey protectionJohn Reck2011-09-061-2/+8
|/ | | | | | Bug: 5134204 Change-Id: Id61b16b17b4a054ab7f1948614399f157f52821f
* Make sure preloaded tabs have unique IDs.Mathew Inwood2011-09-021-0/+1
| | | | | Bug: 5251821 Change-Id: I6dd7561a2461805912268a5faf967199cf39fd8c
* Unregister the NFC callback onPause.Ben Murdoch2011-09-021-2/+2
| | | | | | | | This prevents us from leaking BrowserActivity when we go to the background. Bug: 5233864 Change-Id: Idf59de67637c8c9eb39ea9f8b9cb93320c4afa99
* Merge "Fix blank page activity selection bug"John Reck2011-08-291-6/+2
|\
| * Fix blank page activity selection bugJohn Reck2011-08-291-6/+2
| | | | | | | | | | | | | | | | | | | | Bug: 5191031 Sets an app id on the tab so that if the intent comes back to us, it is opened in the current tab. Close empty tabs correctly if the intent goes elsewhere Fix Tab.syncCurrentState to deal with WebView.getUrl() == null correctly Change-Id: I31e1e1f6688fb5c5c31ba07dde4e6b3bad34fb13
* | Fix issues with state save/restoreJohn Reck2011-08-291-7/+3
|/ | | | | | | | | | | | | Bug: 5144214 Tracked down the issue with messed up state to a bug where tab ids were not unique, and would actually get messed up in restore. Switched it to the tab's responsibility to assign an id to itself in the ctor to make sure all possible paths where a tab is created are fixed as well as the tab being the best informed about whether or not it has an ID to restore from. Added some checks to watch for a similar problem in the future as well. Change-Id: Icd8333232a0baca7a3639323538886ea595de05a
* Updates for NDEF push API change.Nick Pelly2011-08-251-4/+2
| | | | Change-Id: I2390665d59f6b3868b5a3a27bfc38ea4c9cdf0d4
* Drop active tab check when blocking eventsMichael Kolb2011-08-241-14/+5
| | | | | | | Bug: 5198309 The active tab check was freezing the browser Change-Id: I3376c84bb178c02d02deb54bf23fa1149809963d
* Merge "Avoid showing previous tab when closing an app tab"Michael Kolb2011-08-221-2/+9
|\
| * Avoid showing previous tab when closing an app tabMichael Kolb2011-08-221-2/+9
| | | | | | | | | | | | | | | | Bug: 5188145 skip setActiveTab when closing a tab launched from an app set active tab in onResume Change-Id: If602358a61690f15fe2e81a6b3d62d51ad15e16d
* | Add bulletproofing to state recoveryJohn Reck2011-08-221-7/+2
|/ | | | | | Bug: 5166335 Change-Id: Ife9ef2da7664f8de6b0ff9655611efa78d84df05
* YAMR - Yet Another Menu ReorgJohn Reck2011-08-191-0/+10
| | | | | | Bug: 5186166 Change-Id: Icd459c8f9cd557659a5402431a843a856fb1b134
* Show web content before handling new intentMichael Kolb2011-08-181-0/+3
| | | | | | | | Bug: 5184826 hide nav screen before handling new intent Change-Id: I7d6b17f71bb45c05917a4d2346368f0f0188b5f5
* Merge "Faster all the things!"John Reck2011-08-171-20/+0
|\
| * Faster all the things!John Reck2011-08-171-20/+0
| | | | | | | | | | | | | | | | | | | | Bug: 5177959 Improve browser startup. Elinate IO access on UI thread during startup by removing the super legacy ClearThumbnails task. Also rework how the hardware acceleration debug setting works to remove the requirement for initialized BrowserSettings in onCreate Change-Id: I4c1014d380827af4833586e6a3ae842fd59aa48b
* | fix close tab keyboard shortcutMichael Kolb2011-08-161-6/+1
|/ | | | | | | | | Bug: 5129293 Tab closing is handled twice: as a menu shortcut and in the key handler removed the key handler Change-Id: I436b4bcb380ea4daeeea3a9f317e42142f1b2e69
* Fix monkey bugMichael Kolb2011-08-151-5/+14
| | | | | | | | Bug: 5166733 added missing return statements and valid active tab check Change-Id: Ida7ffa6faf77a95eaf19ef566176ad522be4efef
* Tab switcher animationMichael Kolb2011-08-151-0/+28
| | | | | | | | Bug: 5123884 first step towards animations between browser and tab switcher Change-Id: I1d959d42d0036f3c4498972fcc8ad434fa7f4437
* Merge "Don't hide the navscreen when going to bookmarks"John Reck2011-08-111-1/+2
|\
| * Don't hide the navscreen when going to bookmarksJohn Reck2011-08-111-1/+2
| | | | | | | | | | | | Bug: 5144826 Change-Id: If810b3d82c52265f841954f295f5974af9807a01