moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-24 08:38:51 -05:00
Code Issues Releases Wiki Activity

Merge branch '5.103_with_bugfixes'

Browse Source
This commit is contained in:
cketti 2015-05-02 18:11:40 +02:00
commit b660d45b6c
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
k9mail/src/main/AndroidManifest.xml
View File

@ -2,8 +2,8 @@
<manifest <manifest
package="com.fsck.k9" package="com.fsck.k9"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="23050" android:versionCode="23060"
android:versionName="5.105"> android:versionName="5.106">
<uses-feature <uses-feature
android:name="android.hardware.touchscreen" android:name="android.hardware.touchscreen"

8
k9mail/src/main/java/com/fsck/k9/view/RigidWebView.java
View File

@ -18,6 +18,7 @@
package com.fsck.k9.view; package com.fsck.k9.view;
import android.content.Context; import android.content.Context;
import android.os.Build;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.webkit.WebView; import android.webkit.WebView;
@ -34,6 +35,7 @@ import com.fsck.k9.helper.Utility;
* contents with percent-based height will force the WebView to infinitely expand (or shrink). * contents with percent-based height will force the WebView to infinitely expand (or shrink).
*/ */
public class RigidWebView extends WebView { public class RigidWebView extends WebView {
private static final boolean NO_THROTTLE = Build.VERSION.SDK_INT >= 21; //Build.VERSION_CODES.LOLLIPOP
public RigidWebView(Context context) { public RigidWebView(Context context) {
super(context); super(context);
@ -64,8 +66,14 @@ public class RigidWebView extends WebView {
@Override @Override
protected void onSizeChanged(int w, int h, int ow, int oh) { protected void onSizeChanged(int w, int h, int ow, int oh) {
if (NO_THROTTLE) {
super.onSizeChanged(w, h, ow, oh);
return;
}
mRealWidth = w; mRealWidth = w;
mRealHeight = h; mRealHeight = h;
long now = mClock.getTime(); long now = mClock.getTime();
boolean recentlySized = (now - mLastSizeChangeTime < MIN_RESIZE_INTERVAL); boolean recentlySized = (now - mLastSizeChangeTime < MIN_RESIZE_INTERVAL);

3
k9mail/src/main/res/xml/changelog_master.xml
View File

@ -8,6 +8,9 @@
They are automatically updated with "ant bump-version". They are automatically updated with "ant bump-version".
--> -->
<changelog> <changelog>
<release version="5.106" versioncode="23060">
<change>Fixed a bug where messages where not always displayed on Android 5.x</change>
</release>
<release version="5.105" versioncode="23050"> <release version="5.105" versioncode="23050">
<change>Reverted all changes introduced with v5.104 except for the bugfixes related to Android 5.1</change> <change>Reverted all changes introduced with v5.104 except for the bugfixes related to Android 5.1</change>
</release> </release>