summaryrefslogtreecommitdiffstats
path: root/src/com
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add more options to Quick Controls on phone" into ics-mr1Michael Kolb2011-11-231-1/+13
|\
| * Add more options to Quick Controls on phoneMichael Kolb2011-11-221-1/+13
| | | | | | | | | | | | | | | | | | Bug: 5660535 added new tab and bookmarks increased radius of controls Change-Id: I7034e072eae8d59b06c71347b91d9fa042fde3b6
* | Merge "Support super-full-screen mode for html5 video" into ics-mr1Teng-Hui Zhu2011-11-221-1/+6
|\ \ | |/ |/|
| * Support super-full-screen mode for html5 videoTeng-Hui Zhu2011-11-211-1/+6
| | | | | | | | | | | | | | | | bug:5569146 Framework change is c/151486/ Change-Id: I9b622c7de87810ebfab5e01ea77e25c2401deef3
* | Merge "Monkey season" into ics-mr1Michael Kolb2011-11-211-1/+4
|\ \
| * | Monkey seasonMichael Kolb2011-11-211-1/+4
| | | | | | | | | | | | | | | | | | Bug: 5650555 Change-Id: Ia5ea323b3abaf411c24af18193d5d9ac7f63e212
* | | Fix stop/refresh menu stateMichael Kolb2011-11-212-20/+20
|/ / | | | | | | | | | | | | | | | | Bug: 5469075 5640775 Reconcile page load status updates to only use tab state; update menus accordingly Change-Id: Id32f1e0486e8439d6729f3657eda1132c25dfc7e
* | URL bar select allJohn Reck2011-11-211-0/+1
| | | | | | | | | | | | Bug: 5650655 Change-Id: I0b1e2522b158bccdc04d1bdaf4cb01ac53541b70
* | Merge "Remove the psychic labs feature." into ics-mr1Narayan Kamath2011-11-1817-1972/+36
|\ \
| * | Remove the psychic labs feature.Narayan Kamath2011-11-1817-1972/+36
| | | | | | | | | | | | | | | | | | | | | | | | Reverts the UrlInputView to a standard autocomplete that causes less trouble for IMEs. bug:5598837 Change-Id: If469d76f4feda88e4a122264a39d317737404578
* | | Add content description to screenshots in tab managerMichael Kolb2011-11-171-13/+3
| |/ |/| | | | | | | | | Bug: 5619945 Change-Id: I26dc592334dbbd6878887408153249d68046001b
* | Merge "Fix NPE in NavigationBarBase.onAction" into ics-mr1John Reck2011-11-161-1/+5
|\ \
| * | Fix NPE in NavigationBarBase.onActionJohn Reck2011-11-151-1/+5
| | | | | | | | | | | | | | | | | | Bug: 5476078 Change-Id: Ic21f45656b473a09709e53274f1f90312bcba920
* | | Prevent NPE in NavTabScrollerMichael Kolb2011-11-161-0/+1
|/ / | | | | | | | | | | | | Bug: 5619924 Monkey see, but Monkey don't do. Change-Id: I807693425eea93c6cb8cf616f2ff7f8f0827026e
* | Remove old != new onScrollChanged checkJohn Reck2011-11-141-12/+10
|/ | | | | | | Bug: 5533389 That is now meaningful in that it signifies a layer was scrolled Change-Id: I24734eb2739c0d020b32d16394c6133f9de990c5
* Merge "Set home button enabled" into ics-mr1John Reck2011-11-101-0/+1
|\
| * Set home button enabledJohn Reck2011-11-101-0/+1
| | | | | | | | | | | | Bug: 5553034 Change-Id: Ifc47c233af3ac3010045498739ee5e1602656ce2
* | Merge "Handle error condition when inserting snapshots" into ics-mr1John Reck2011-11-101-0/+8
|\ \
| * | Handle error condition when inserting snapshotsJohn Reck2011-11-101-0/+8
| |/ | | | | | | | | | | Bug: 5599226 Change-Id: I4429ed965325d908cdc5094c37d856f4d9d68933
* | Special case the root folder in add bookmarksJohn Reck2011-11-091-1/+8
|/ | | | | | | | | | | Bug: 5505282 The special "Other Bookmarks" folder isn't a child of the special "Bookmarks" folder. The merging of those two is only handled if the URI is CONTENT_URI_DEFAULT_FOLDER, not if a specific folder id is given. Thus we need to special case that in the AddBookmarkPage loader. Change-Id: Ic92fba5ea8c758fc153a9cfd0c567bcfdcbc524d
* Merge "Add Monkey protection" into ics-mr1Michael Kolb2011-11-081-1/+3
|\
| * Add Monkey protectionMichael Kolb2011-11-071-1/+3
| | | | | | | | | | | | Bug: 5577443 Change-Id: I61f59ec5e65de0b59890804f2fb0eb7ab182326d
* | Add support to minimize the WebView's memory consumption by defaultTeng-Hui Zhu2011-11-072-0/+8
|/ | | | | | | | webkit change is c/148241 bug:5522175 Change-Id: I8562c39c55913ab89848afe8a36e8a2784c12727
* Merge "Switch Tab to DataController" into ics-mr1John Reck2011-11-012-81/+95
|\
| * Switch Tab to DataControllerJohn Reck2011-10-312-81/+95
| | | | | | | | | | | | Bug: 5544674 Change-Id: I24486c65c1cc1fbcf7abe95b74731b10918db82c
* | Merge "Monkey proofing" into ics-mr1John Reck2011-10-311-13/+25
|\ \
| * | Monkey proofingJohn Reck2011-10-311-13/+25
| |/ | | | | | | | | | | Bug: 5531453 Change-Id: I0a8158212d8b2de638bae3c66bb2b9aa3bf85c1d
* | Fix corner case with url pulldownJohn Reck2011-10-311-1/+5
|/ | | | | | | | | | Bug: 5534329 The issue is that with 1px visible of the title bar the url pulldown code wouldn't trigger to prevent a janky animation. Detect whether or not the page is scrolling, and if it isn't then show the url bar even if it is partially visible Change-Id: I2e7771f0e08a7dc9a6d3968e2d5e1402b1a454fa
* Don't set the upload type unless in debugJohn Reck2011-10-271-6/+10
| | | | | | | Bug: 5529012 Reduce unnecessary JNI Change-Id: Ie1fc504bf8a159bf0ee5b26e89cb29b445ad7723
* merge ics-mr0Ed Heyl2011-10-252-3/+25
|\ | | | | | | Change-Id: Ifc31b8464766d17b2f46183cbe0e7309445b07dc
| * Merge "Use UTF-8 for font size preview" into ics-mr0John Reck2011-10-242-3/+25
| |\
| | * Use UTF-8 for font size previewJohn Reck2011-10-212-3/+25
| | | | | | | | | | | | | | | | | | | | | Bug: 5489018 Apparantly ASCII isn't good enough Change-Id: I9402c7c3e1ceedc26822469b652166885a40d6e3
* | | am 1eb7d122: Merge "Fix fullscreen mode" into ics-mr0Michael Kolb2011-10-211-5/+19
|\ \ \ | |/ / | | | | | | | | | * commit '1eb7d1224fafa2c7f327c808cf6eec6269297493': Fix fullscreen mode
| * | Fix fullscreen modeMichael Kolb2011-10-211-5/+19
| |/ | | | | | | | | | | | | | | | | Bug: 5494143 Set fullscreen flags on window hide system UI Change-Id: I38714fd3973d2ee0baca51eb89f0ca640cbab225
* | am ce937c5f: Merge "fix tab out animation bug" into ics-mr0John Reck2011-10-182-73/+113
|\ \ | |/ | | | | | | * commit 'ce937c5f62b1f0b3091a123c1870377818744b52': fix tab out animation bug
| * Merge "fix tab out animation bug" into ics-mr0John Reck2011-10-182-73/+113
| |\
| | * fix tab out animation bugMichael Kolb2011-10-182-73/+113
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5464898 Changed out animation for collapsing and scrolling Change-Id: I4a14bcb63aba9b9498a3e7835aa98d4c8312f00a
* | | am 4e61ad77: Merge "Cleanup widget config activity" into ics-mr0John Reck2011-10-182-5/+30
|\ \ \ | |/ / | | | | | | | | | * commit '4e61ad777a698ad7c67be6e4dcf7410b30b08e6f': Cleanup widget config activity
| * | Merge "Cleanup widget config activity" into ics-mr0John Reck2011-10-182-5/+30
| |\ \
| | * | Cleanup widget config activityJohn Reck2011-10-172-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5474306 Change-Id: I233bc89d15cc76c5bb9d0bcea8397f765b66ef24
* | | | 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
| |\ \