summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | am c5b0b2db: Fix yet another Monkey NPEMichael Kolb2011-11-301-1/+2
|\ \ | |/ | | | | | | * commit 'c5b0b2db3b917e658700642763fb50da0057716b': Fix yet another Monkey NPE
| * Fix yet another Monkey NPEMichael Kolb2011-11-291-1/+2
| | | | | | | | | | | | Bug: 5685380 Change-Id: Ida841160df6e76318ebb8e2b3804a40184b96161
* | am 7431a694: Merge "Fix NPE at startup" into ics-mr1Bart Sears2011-11-281-1/+1
|\ \ | |/ | | | | | | * commit '7431a694054d56b5d56410f708f97bc2a81ae5e3': Fix NPE at startup
| * Merge "Fix NPE at startup" into ics-mr1Bart Sears2011-11-281-1/+1
| |\
| | * Fix NPE at startupMichael Kolb2011-11-281-1/+1
| | | | | | | | | | | | | | | | | | Bug: 5676863 Change-Id: I673699e577f0ed2cfa85260f905ccccc0d852399
* | | Merge "Remove an init. workaround for Cookiemanager."Selim Gurun2011-11-231-2/+0
|\ \ \
| * | | Remove an init. workaround for Cookiemanager.Selim Gurun2011-11-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:5253777 This workaround is now not necessary as we not do not block while accessing cookie manager settings. Change-Id: I7b1df4b60124123b6493a0320d2d96dfdd8d2c29
* | | | Merge "Crash recover no longer uses icicle."George Mount2011-11-235-98/+162
|\ \ \ \
| * | | | Crash recover no longer uses icicle.George Mount2011-11-235-98/+162
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 6cfe9772: Start downloads as a new taskJohn Reck2011-11-231-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '6cfe97725ede972940bf3090a4474b1e2c017a9f': Start downloads as a new task
| * | | Start downloads as a new taskJohn Reck2011-11-231-0/+1
| | |/ | |/| | | | | | | | | | | | | Bug: 5661310 Change-Id: Ib6d4d08474116d6a222eedd0cf40830c9286a2dd
* | | am 63faec47: Merge "Add more options to Quick Controls on phone" into ics-mr1Michael Kolb2011-11-231-1/+13
|\ \ \ | |/ / | | | | | | | | | * commit '63faec479010e77762d5ffa517fdc65f3474383c': Add more options to Quick Controls on phone
| * | 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
* | | | am 78ea2875: Merge "Support super-full-screen mode for html5 video" into ics-mr1Teng-Hui Zhu2011-11-221-1/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '78ea2875af7145f7a9c167e09b294b7a38acefb5': Support super-full-screen mode for html5 video
| * | | 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
* | | | 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-212-20/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'b1fb70cee9e24f3f9e648dff1816403c427976d1': Fix stop/refresh menu state
| * | | | 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
* | | | am 2edc80c2: URL bar select allJohn Reck2011-11-211-0/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit '2edc80c2ccca9030f8013328cc2e37bc374d3d92': URL bar select all
| * | URL bar select allJohn Reck2011-11-211-0/+1
| | | | | | | | | | | | | | | | | | Bug: 5650655 Change-Id: I0b1e2522b158bccdc04d1bdaf4cb01ac53541b70
* | | am 3e5e5fad: Merge "Remove the psychic labs feature." into ics-mr1Narayan Kamath2011-11-1817-1972/+36
|\ \ \ | |/ / | | | | | | | | | * commit '3e5e5fada69d74bb50b14ef3588e7beadaedfd69': Remove the psychic labs feature.
| * | 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
* | | | am a9a5967e: Add content description to screenshots in tab managerMichael Kolb2011-11-181-13/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a9a5967ea18d4b442ae5433cd3759b3921e480ad': Add content description to screenshots in tab manager
| * | | Add content description to screenshots in tab managerMichael Kolb2011-11-171-13/+3
| | |/ | |/| | | | | | | | | | | | | Bug: 5619945 Change-Id: I26dc592334dbbd6878887408153249d68046001b
* | | Show download complete message for data URI downloads.George Mount2011-11-171-1/+1
| | | | | | | | | | | | | | | | | | Bug 5566849 Change-Id: Ifdb9a952a2b0b28d0f34ba11d112ef9b465bf564
* | | am 4eb312fa: Merge "Fix NPE in NavigationBarBase.onAction" into ics-mr1John Reck2011-11-171-1/+5
|\ \ \ | |/ / | | | | | | | | | * commit '4eb312faf9d7850dee4a1f10a41b343a4c923c03': Fix NPE in NavigationBarBase.onAction
| * | 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
* | | | am b217888b: Merge "Prevent NPE in NavTabScroller" into ics-mr1Michael Kolb2011-11-171-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b217888b48e01cdd92db7efa67d0ba8347c8538d': Prevent NPE in NavTabScroller
| * | | Prevent NPE in NavTabScrollerMichael Kolb2011-11-161-0/+1
| |/ / | | | | | | | | | | | | | | | | | | Bug: 5619924 Monkey see, but Monkey don't do. Change-Id: I807693425eea93c6cb8cf616f2ff7f8f0827026e
* | | am bb0b1660: Merge "Remove old != new onScrollChanged check" into ics-mr1John Reck2011-11-151-12/+10
|\ \ \ | |/ / | | | | | | | | | * commit 'bb0b166023502a3d5f68e166c7d009e6921b2417': Remove old != new onScrollChanged check
| * | 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 "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
* | | am ccd78601: Merge "Set home button enabled" into ics-mr1John Reck2011-11-111-0/+1
|\ \ \ | | |/ | |/| | | | | | | * commit 'ccd78601a934cf1ffafe5854a1d465c273727f69': Set home button enabled
| * | 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
* | | | am 897b8838: Merge "Handle error condition when inserting snapshots" into ↵John Reck2011-11-111-0/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit '897b8838bb59fa89226a4b72e27571eefe43ca60': Handle error condition when inserting snapshots
| * | | 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
* | | | am 4409358a: Merge "Special case the root folder in add bookmarks" into ics-mr1John Reck2011-11-111-1/+8
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit '4409358ac603ec61f42a1b40f90d8b2893d9ad0b': Special case the root folder in add bookmarks
| * | 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
* | am 50c04abe: Merge "Add Monkey protection" into ics-mr1Michael Kolb2011-11-091-1/+3
|\ \ | |/ | | | | | | * commit '50c04abe67ac1eebd5a07777b5395b244d90b9ac': Add Monkey protection
| * 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