summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
* | | am e7c44c28: Merge "Add support to minimize the WebView\'s memory ↵Teng-Hui Zhu2011-11-072-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | consumption by default" into ics-mr1 * commit 'e7c44c2871ea595c8c3f879f19e8790083dbb84c': Add support to minimize the WebView's memory consumption by default
| * | 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
* | am 91c61a5b: Merge "Switch Tab to DataController" into ics-mr1John Reck2011-11-022-81/+95
|\ \ | |/ | | | | | | * commit '91c61a5b3bd8de65e30a0ead6d1f634a6dc7a79f': Switch Tab to DataController
| * 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
* | | am 36b2aac5: Merge "Monkey proofing" into ics-mr1John Reck2011-11-021-13/+25
|\ \ \ | |/ / | | | | | | | | | * commit '36b2aac54e5a9f90addf8092c7b5358822d2b1c4': Monkey proofing
| * | Merge "Monkey proofing" into ics-mr1John Reck2011-10-311-13/+25
| |\ \
| | * | Monkey proofingJohn Reck2011-10-311-13/+25
| | |/ | | | | | | | | | | | | | | | Bug: 5531453 Change-Id: I0a8158212d8b2de638bae3c66bb2b9aa3bf85c1d
* | | am fd02f6d4: Merge "Fix corner case with url pulldown" into ics-mr1John Reck2011-11-021-1/+5
|\ \ \ | |/ / | | | | | | | | | * commit 'fd02f6d47c75e37f4eff80e823a0d9c7c10f6c08': Fix corner case with url pulldown
| * | 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
* | am d27d769b: Merge "Don\'t set the upload type unless in debug" into ics-mr1John Reck2011-10-281-6/+10
|\ \ | |/ | | | | | | * commit 'd27d769bc23b88d97bbdf6a40384977afbd7a69d': Don't set the upload type unless in debug
| * 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
* | | Prepopulate the users autofill text.Ben Murdoch2011-10-281-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the browser starts, if autofill is on and no profile is already set up, try to read the user's "me" contact and prepopulate their profile with what we can get. Bug: 5427308 Change-Id: I23e0369f64b2b69763d1934f7ed6b2ece9cca282
* | | Fix monkey crash in AutofillSettingsFragment.Ben Murdoch2011-10-271-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible to trigger the options menu before the views are fully inflated if you're really fast like the monkey. Bug: 5518582 Change-Id: I86402cc1df70289d9f0685a5c9949ac38fbd9cd0
* | | Merge "Fix Autofill profile editor UI."Ben Murdoch2011-10-251-33/+39
|\ \ \
| * | | Fix Autofill profile editor UI.Ben Murdoch2011-10-201-33/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the save button into the action bar to conserve space. Update the IME options so that we don't enter extract mode. Bug: 5210430 Change-Id: I0c5d6c200071130c9b6ed19a1def7ac0fd42ac10
* | | | resolved conflicts for merge of cde9b959 to masterJohn Reck2011-10-242-3/+25
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| Change-Id: I0f3c18d6cfffb286098357e7643bc4f1d6fc9239
| * | 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
generated by cgit v1.1 at 2025-09-15 07:04:05 +0000