mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-30 21:55:10 +00:00
Code Issues Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Albert Vaca
2015-09-10 15:52:21 -07:00
parent 424763e3b6 52a61f5663
commit 8307850805
6 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-hdpi/ic_volume.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 823 B

BIN
res/drawable-mdpi/ic_volume.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 988 B

After

Width:  |  Height:  |  Size: 497 B

BIN
res/drawable-xhdpi/ic_volume.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
res/drawable-xxhdpi/ic_volume.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
res/drawable-xxxhdpi/ic_volume.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

3
tests/org/kde/kdeconnect/LanLinkTest.java
View File

@@ -26,6 +26,7 @@ import android.util.Log;
import org.apache.mina.core.future.WriteFuture; import org.apache.mina.core.future.WriteFuture;
import org.apache.mina.core.session.IoSession; import org.apache.mina.core.session.IoSession;
import org.json.JSONObject; import org.json.JSONObject;
import org.kde.kdeconnect.Backends.BaseLink;
import org.kde.kdeconnect.Backends.LanBackend.LanLink; import org.kde.kdeconnect.Backends.LanBackend.LanLink;
import org.kde.kdeconnect.Backends.LanBackend.LanLinkProvider; import org.kde.kdeconnect.Backends.LanBackend.LanLinkProvider;
import org.mockito.Mockito; import org.mockito.Mockito;
@@ -80,7 +81,7 @@ public class LanLinkTest extends AndroidTestCase {
Mockito.when(writeFutureFailure.isDone()).thenReturn(true); Mockito.when(writeFutureFailure.isDone()).thenReturn(true);
Mockito.when(writeFutureFailure.getException()).thenReturn(new RuntimeException()); Mockito.when(writeFutureFailure.getException()).thenReturn(new RuntimeException());
lanLink = new LanLink(session, "testDevice", linkProvider); lanLink = new LanLink(session, "testDevice", linkProvider, BaseLink.ConnectionStarted.Remotely);
} }
@Override @Override