mirror of
https://github.com/moparisthebest/k-9
synced 2025-01-30 23:00:09 -05:00
Revert auto-scroll changes that are no longer needed.
Revert "Only Jelly Bean seems to have the auto-scroll issue" This reverts commita3802a7a8e
. Revert "Hack around WebView's initial auto-scrolling past the message header" This reverts commit8dcc769c50
. Conflicts: src/com/fsck/k9/view/MessageWebView.java
This commit is contained in:
parent
94a4585317
commit
7b0082026c
@ -49,9 +49,6 @@ public class MessageWebView extends WebView {
|
||||
}
|
||||
|
||||
|
||||
private int mOverrideScrollCounter;
|
||||
|
||||
|
||||
public MessageWebView(Context context) {
|
||||
super(context);
|
||||
}
|
||||
@ -188,7 +185,6 @@ public class MessageWebView extends WebView {
|
||||
content += HtmlConverter.cssStylePre();
|
||||
content += "</head><body>" + text + "</body></html>";
|
||||
loadDataWithBaseURL("http://", content, "text/html", "utf-8", null);
|
||||
mOverrideScrollCounter = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -207,25 +203,4 @@ public class MessageWebView extends WebView {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void scrollTo(int x, int y) {
|
||||
if (Build.VERSION.SDK_INT >= 16 && mOverrideScrollCounter < 3) {
|
||||
/*
|
||||
* 2013-03-12 - cketti
|
||||
*
|
||||
* WebView on Android 4.1+ automatically scrolls past the title view using this method.
|
||||
* It looks like user-triggered scroll operations don't call this method. So we use
|
||||
* it to override the initial scrolling past the title view.
|
||||
*
|
||||
* It's a dirty hack and we should find a better way to display the message header. When
|
||||
* testing this I saw up to two calls to this method during initialization. To make
|
||||
* sure we don't totally cripple the WebView when the implementation changes we only
|
||||
* override the first three scrollTo() invocations.
|
||||
*/
|
||||
y = 0;
|
||||
mOverrideScrollCounter++;
|
||||
}
|
||||
|
||||
super.scrollTo(x, y);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user