Bumped version number to release

Android doesn't support languages with an @, hack to fix build
Disable colored output
2025-09-01 06:35:09 +00:00 · 2016-01-17 11:03:16 -08:00 · 2016-01-17 10:40:03 -08:00 · 2016-01-17 10:39:41 -08:00 · 2016-01-17 11:58:50 +00:00 · 2016-01-16 11:50:30 +00:00
254 changed files with 5683 additions and 14822 deletions
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,3 +0,0 @@
-{
-  "phabricator.uri" : "https://phabricator.kde.org/project/profile/159/"
-}
--- a/.gitignore
+++ b/.gitignore
@@ -12,5 +12,3 @@ gradlew
 gradlew.bat
 *.iml
 *.keystore
-.directory
-GPUCache/
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="org.kde.kdeconnect_tp"
-    android:versionCode="1830"
-    android:versionName="1.8.3">
+    android:versionCode="910"
+    android:versionName="0.9g">
+
+    <uses-sdk android:minSdkVersion="9"
+              android:targetSdkVersion="22" />

    <supports-screens
        android:anyDensity="true"
@@ -17,45 +20,33 @@

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.INTERNET" />
-    <!--<uses-permission android:name="android.permission.BLUETOOTH" />-->
-    <!--<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+    <uses-permission
+        android:name="android.permission.READ_PHONE_STATE"
+        android:required="false" />
    <uses-permission android:name="android.permission.BATTERY_STATS" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS" />
-    <uses-permission android:name="android.permission.SEND_SMS" />
-    <uses-permission android:name="android.permission.READ_SMS" />
+    <uses-permission
+        android:name="android.permission.RECEIVE_SMS"
+        android:required="false" />
    <uses-permission android:name="android.permission.READ_CONTACTS" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />

    <application
        android:allowBackup="true"
        android:icon="@drawable/icon"
        android:label="KDE Connect"
-        android:supportsRtl="true"
-        android:theme="@style/KdeConnectTheme">
+        android:theme="@style/KdeConnectTheme"
+        >

        <service
            android:name="org.kde.kdeconnect.BackgroundService"
-            android:enabled="true" />
-
-        <service
-            android:name="org.kde.kdeconnect.Plugins.RemoteKeyboardPlugin.RemoteKeyboardService"
-            android:label="KDE Connect Remote Keyboard"
-            android:permission="android.permission.BIND_INPUT_METHOD">
-            <intent-filter>
-                <action android:name="android.view.InputMethod" />
-            </intent-filter>
-            <meta-data
-                android:name="android.view.im"
-                android:resource="@xml/remotekeyboardplugin_method" />
+            android:enabled="true" >
        </service>

        <activity
-            android:name="org.kde.kdeconnect.UserInterface.MainActivity"
+            android:name="org.kde.kdeconnect.UserInterface.MaterialActivity"
            android:label="KDE Connect"
            android:theme="@style/KdeConnectTheme.NoActionBar">
            <intent-filter>
@@ -67,46 +58,37 @@
        <activity
            android:name="org.kde.kdeconnect.UserInterface.SettingsActivity"
            android:label="@string/device_menu_plugins"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity" >
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
        </activity>
        <activity
            android:name="org.kde.kdeconnect.UserInterface.CustomDevicesActivity"
            android:label="@string/custom_devices_settings"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity" >
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
        </activity>
        <activity
            android:name="org.kde.kdeconnect.Plugins.SharePlugin.SendFileActivity"
            android:label="KDE Connect"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity" >
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
        </activity>
        <activity
            android:name="org.kde.kdeconnect.UserInterface.PluginSettingsActivity"
            android:label="@string/device_menu_plugins"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.SettingsActivity">
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.SettingsActivity" >
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value="org.kde.kdeconnect.UserInterface.SettingsActivity" />
        </activity>
-        <activity
-            android:name="org.kde.kdeconnect.Plugins.SharePlugin.ShareSettingsActivity"
-            android:label="@string/device_menu_plugins"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.SettingsActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.Plugins.SharePlugin.ShareSettingsActivity" />
-        </activity>

-
-        <receiver android:name="org.kde.kdeconnect.KdeConnectBroadcastReceiver">
+        <receiver android:name="org.kde.kdeconnect.KdeConnectBroadcastReceiver" >
            <intent-filter>
                <action android:name="android.intent.action.PACKAGE_REPLACED" />

@@ -124,53 +106,44 @@
            <intent-filter>
                <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
            </intent-filter>
+            <!--
+            <intent-filter>
+                <action android:name="android.provider.Telephony.SMS_RECEIVED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PHONE_STATE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.BATTERY_CHANGED" />
+            </intent-filter>
+            -->
        </receiver>

-        <activity
-            android:name="org.kde.kdeconnect.Plugins.FindMyPhonePlugin.FindMyPhoneActivity"
-            android:configChanges="orientation|screenSize"
-            android:excludeFromRecents="true"
-            android:label="@string/findmyphone_title"
-            android:launchMode="singleInstance" />
-
        <!-- Plugin-related activities and services -->

        <activity
            android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisActivity"
            android:label="@string/remote_control"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
-            android:launchMode="singleTop">
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity"
+            >
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-        </activity>
-        <receiver android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisMediaNotificationReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON" />
-            </intent-filter>
-        </receiver>
-
-        <activity
-            android:name="org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandActivity"
-            android:label="@string/remote_control"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
        </activity>
        <activity
            android:name="org.kde.kdeconnect.Plugins.MousePadPlugin.MousePadActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
            android:label="@string/remote_control"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize">
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity"
+            android:windowSoftInputMode="stateHidden|adjustResize" >
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
        </activity>
        <activity
            android:name="org.kde.kdeconnect.Plugins.SharePlugin.ShareActivity"
-            android:label="KDE Connect">
+            android:label="KDE Connect"
+            >
            <intent-filter>
                <action android:name="android.intent.action.SEND" />

@@ -185,47 +158,24 @@

                <data android:mimeType="*/*" />
            </intent-filter>
-
-            <meta-data
-                android:name="android.service.chooser.chooser_target_service"
-                android:value="org.kde.kdeconnect.Plugins.SharePlugin.ShareChooserTargetService" />
        </activity>
-
-        <provider
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="org.kde.kdeconnect_tp.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/fileprovider_paths" />
-        </provider>
-
        <service
            android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationReceiver"
-            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
+            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" >
            <intent-filter>
                <action android:name="android.service.notification.NotificationListenerService" />
            </intent-filter>
        </service>
-        <service
-            android:name="org.kde.kdeconnect.Plugins.SharePlugin.ShareChooserTargetService"
-            android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
-            <intent-filter>
-                <action android:name="android.service.chooser.ChooserTargetService" />
-            </intent-filter>
-        </service>

        <activity
            android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationFilterActivity"
            android:label="@string/title_activity_notification_filter"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.PluginSettingsActivity">
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.PluginSettingsActivity" >
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value="org.kde.kdeconnect.UserInterface.PluginSettingsActivity" />
        </activity>

-
    </application>

 </manifest>
--- a/README.md
+++ b/README.md
@@ -4,26 +4,22 @@ KDE Connect is a multi-platform app that allows your devices to communicate (eg:

 ## (Some) Features
 - **Shared clipboard**: copy and paste between your phone and your computer (or any other device).
- **Notification sync**: Read and reply to your Android notifications from the desktop.
+- **Notification sync**: Read your Android notifications from the desktop.
 - **Share files and URLs** instantly from one device to another.
 - **Multimedia remote control**: Use your phone as a remote for Linux media players.
- **Virtual touchpad**: Use your phone screen as your computer's touchpad and keyboard.
+- **Virtual touchpad**: Use your phone screen as your computer's touchpad.

-All this without wires, over the already existing WiFi network, and using TLS encryption.
+All this without wires, over the already existing WiFi network, and using a secure, encrypted protocol.

 ## About this app

-This is a native Android port of the KDE Connect Qt app. You will find a more complete readme about KDE Connect [here](https://github.com/KDE/kdeconnect-kde).
+This is a native Android port of the KDE Connect Qt app. You will find a more complete readme about KDE Connect [here](https://github.com/albertvaka/kdeconnect-kde).

 ## How to install this app

-You can install this app from the [Play Store](https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp) as well as [F-Droid](https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp). Note you will also need to install the [desktop app](https://github.com/KDE/kdeconnect-kde) for it to work.
-
-## Contributing
-
-To contribute patches, use [KDE Connect's Phabricator](https://phabricator.kde.org/project/profile/159/). There you can also find a task list with stuff to do, and links to other relevant resources. It is a good idea to also subscribe to the [KDE Connect mailing list](https://mail.kde.org/mailman/listinfo/kdeconnect).
+You can install this app from the [Play Store](https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp) as well as [F-Droid](https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp). Note you will also need to install the [desktop app](https://github.com/albertvaka/kdeconnect-kde) for it to work.

 ## License
 [GNU GPL v2](https://www.gnu.org/licenses/gpl-2.0.html) and [GNU GPL v3](https://www.gnu.org/licenses/gpl-3.0.html)

-If you are reading this from Github, you should know that this is just a mirror of the [KDE Project repo](https://projects.kde.org/projects/extragear/network/kdeconnect-android/repository/).
+If you are reading this from Github, you should know that this is just a mirror of the [KDE Project repo](https://projects.kde.org/projects/playground/base/kdeconnect-android/repository/).
--- a/build.gradle
+++ b/build.gradle
@@ -1,30 +1,20 @@
 buildscript {
    repositories {
        jcenter()
-        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:1.3.0'
    }
 }

 apply plugin: 'com.android.application'

 android {
-    buildToolsVersion '27.0.3'
-    compileSdkVersion 25
+    compileSdkVersion 22
+    buildToolsVersion '22.0.1'
    defaultConfig {
        minSdkVersion 9
-        targetSdkVersion 25
-        //multiDexEnabled true
-        //testInstrumentationRunner "com.android.test.runner.MultiDexTestRunner"
-    }
-    dexOptions {
-        javaMaxHeapSize "2g"
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetSdkVersion 22
    }
 	sourceSets {
        main {
@@ -42,48 +32,36 @@ android {
        pickFirst "META-INF/DEPENDENCIES"
        pickFirst "META-INF/LICENSE"
        pickFirst "META-INF/NOTICE"
-        pickFirst "META-INF/BCKEY.SF"
-        pickFirst "META-INF/BCKEY.DSA"
-        pickFirst "META-INF/INDEX.LIST"
-        pickFirst "META-INF/io.netty.versions.properties"
    }
    lintOptions {
        abortOnError false
        checkReleaseBuilds false
    }
    buildTypes {
-        debug {
-            minifyEnabled false
-            useProguard false
-        }
-        release { //keep on 'release', set to 'all' when testing to make sure proguard is not deleting important stuff
+        release {
            minifyEnabled true
-            useProguard true
            proguardFiles getDefaultProguardFile('proguard-android.txt'),'proguard-rules.pro'
        }
    }
 }

 dependencies {
-
    repositories {
-        jcenter()
-        google()
+        mavenCentral()
    }
+    compile 'com.android.support:support-v4:22.2.1'
+    compile 'com.android.support:appcompat-v7:22.2.1'
+    compile 'com.android.support:design:22.2.1'

-    implementation 'com.android.support:support-v4:25.4.0'
-    implementation 'com.android.support:appcompat-v7:25.4.0'
-    implementation 'com.android.support:design:25.4.0'
-    implementation 'com.jakewharton:disklrucache:2.0.2' //For caching album art bitmaps
+    compile 'org.apache.mina:mina-core:2.0.9'
+    compile 'org.apache.sshd:sshd-core:0.8.0'
+    compile 'org.bouncycastle:bcprov-jdk16:1.46'

-    implementation 'org.apache.sshd:sshd-core:0.8.0' //0.9 seems to fail on Android 6 and 1.+ requires java.nio.file, which doesn't exist in Android
+    androidTestCompile 'org.mockito:mockito-core:1.10.19'

-    implementation 'com.madgag.spongycastle:pkix:1.54.0.0' //For SSL certificate generation
-
-    // Testing
-    androidTestImplementation 'org.mockito:mockito-core:1.10.19'
-    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.1'// Because mockito has some problems with dex environment
-    androidTestImplementation 'org.skyscreamer:jsonassert:1.3.0'
-    testImplementation 'junit:junit:4.12'
+    // Because mockito has some problems with dex environment
+    androidTestCompile 'com.google.dexmaker:dexmaker:1.1'
+    androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.1'

+    //compile fileTree(dir: 'libs', include: '*.jar')
 }
--- a/proguard-rules.pro
+++ b/proguard-rules.pro
@@ -16,24 +16,15 @@
 #   public *;
 #}

-dontobfuscate
-
 # Allow obfuscation of android.support.v7.internal.view.menu.**
 # to avoid problem on Samsung 4.2.2 devices with appcompat v21
 # see https://code.google.com/p/android/issues/detail?id=78377
-keepnames class !android.support.v7.internal.view.menu.**,android.support.v7.** {*;}
+-keep class !android.support.v7.internal.view.menu.**,** {*;}

-dontwarn org.spongycastle.**
 -dontwarn org.apache.sshd.**
 -dontwarn org.apache.mina.**
+-dontwarn org.bouncycastle.**
 -dontwarn org.slf4j.**
-dontwarn io.netty.**

-keepattributes SourceFile,LineNumberTable,Signature,*Annotation*
+-keepattributes SourceFile,LineNumberTable

-keep class org.spongycastle.** {*;}
-
-# SSHd requires mina, and mina uses reflection so some classes would get deleted
-keep class org.apache.mina.** {*;}
-
-keep class org.kde.kdeconnect.** {*;}
--- a/res/drawable-hdpi/ic_accept_pairing.png
+++ b/res/drawable-hdpi/ic_accept_pairing.png
--- a/res/drawable-hdpi/ic_device_tv.png
+++ b/res/drawable-hdpi/ic_device_tv.png
--- a/res/drawable-hdpi/ic_error_outline_black_48dp.png
+++ b/res/drawable-hdpi/ic_error_outline_black_48dp.png
--- a/res/drawable-hdpi/ic_keyboard_hide_white_36dp.png
+++ b/res/drawable-hdpi/ic_keyboard_hide_white_36dp.png
--- a/res/drawable-hdpi/ic_phonelink_off_white_36dp.png
+++ b/res/drawable-hdpi/ic_phonelink_off_white_36dp.png
--- a/res/drawable-hdpi/ic_phonelink_white_36dp.png
+++ b/res/drawable-hdpi/ic_phonelink_white_36dp.png
--- a/res/drawable-hdpi/ic_reject_pairing.png
+++ b/res/drawable-hdpi/ic_reject_pairing.png
--- a/res/drawable-hdpi/ic_volume.png
+++ b/res/drawable-hdpi/ic_volume.png
--- a/res/drawable-hdpi/mpris_plugin_action.png
+++ b/res/drawable-hdpi/mpris_plugin_action.png
--- a/res/drawable-hdpi/runcommand_plugin_icon.png
+++ b/res/drawable-hdpi/runcommand_plugin_icon.png
--- a/res/drawable-mdpi/ic_accept_pairing.png
+++ b/res/drawable-mdpi/ic_accept_pairing.png
--- a/res/drawable-mdpi/ic_device_tv.png
+++ b/res/drawable-mdpi/ic_device_tv.png
--- a/res/drawable-mdpi/ic_error_outline_black_48dp.png
+++ b/res/drawable-mdpi/ic_error_outline_black_48dp.png
--- a/res/drawable-mdpi/ic_keyboard_hide_white_36dp.png
+++ b/res/drawable-mdpi/ic_keyboard_hide_white_36dp.png
--- a/res/drawable-mdpi/ic_phonelink_off_white_36dp.png
+++ b/res/drawable-mdpi/ic_phonelink_off_white_36dp.png
--- a/res/drawable-mdpi/ic_phonelink_white_36dp.png
+++ b/res/drawable-mdpi/ic_phonelink_white_36dp.png
--- a/res/drawable-mdpi/ic_reject_pairing.png
+++ b/res/drawable-mdpi/ic_reject_pairing.png
--- a/res/drawable-mdpi/ic_volume.png
+++ b/res/drawable-mdpi/ic_volume.png
--- a/res/drawable-mdpi/mpris_plugin_action.png
+++ b/res/drawable-mdpi/mpris_plugin_action.png
--- a/res/drawable-mdpi/runcommand_plugin_icon.png
+++ b/res/drawable-mdpi/runcommand_plugin_icon.png
--- a/res/drawable-mdpi/share_plugin_action.png
+++ b/res/drawable-mdpi/share_plugin_action.png
--- a/res/drawable-xhdpi/ic_accept_pairing.png
+++ b/res/drawable-xhdpi/ic_accept_pairing.png
--- a/res/drawable-xhdpi/ic_device_tv.png
+++ b/res/drawable-xhdpi/ic_device_tv.png
--- a/res/drawable-xhdpi/ic_error_outline_black_48dp.png
+++ b/res/drawable-xhdpi/ic_error_outline_black_48dp.png
--- a/res/drawable-xhdpi/ic_keyboard_hide_white_36dp.png
+++ b/res/drawable-xhdpi/ic_keyboard_hide_white_36dp.png
--- a/res/drawable-xhdpi/ic_phonelink_off_white_36dp.png
+++ b/res/drawable-xhdpi/ic_phonelink_off_white_36dp.png
--- a/res/drawable-xhdpi/ic_phonelink_white_36dp.png
+++ b/res/drawable-xhdpi/ic_phonelink_white_36dp.png
--- a/res/drawable-xhdpi/ic_reject_pairing.png
+++ b/res/drawable-xhdpi/ic_reject_pairing.png
--- a/res/drawable-xhdpi/ic_volume.png
+++ b/res/drawable-xhdpi/ic_volume.png
--- a/res/drawable-xhdpi/mpris_plugin_action.png
+++ b/res/drawable-xhdpi/mpris_plugin_action.png
--- a/res/drawable-xhdpi/runcommand_plugin_icon.png
+++ b/res/drawable-xhdpi/runcommand_plugin_icon.png
--- a/res/drawable-xhdpi/share_plugin_action.png
+++ b/res/drawable-xhdpi/share_plugin_action.png
--- a/res/drawable-xxhdpi/ic_accept_pairing.png
+++ b/res/drawable-xxhdpi/ic_accept_pairing.png
--- a/res/drawable-xxhdpi/ic_device_tv.png
+++ b/res/drawable-xxhdpi/ic_device_tv.png
--- a/res/drawable-xxhdpi/ic_error_outline_black_48dp.png
+++ b/res/drawable-xxhdpi/ic_error_outline_black_48dp.png
--- a/res/drawable-xxhdpi/ic_keyboard_hide_white_36dp.png
+++ b/res/drawable-xxhdpi/ic_keyboard_hide_white_36dp.png
--- a/res/drawable-xxhdpi/ic_phonelink_off_white_36dp.png
+++ b/res/drawable-xxhdpi/ic_phonelink_off_white_36dp.png
--- a/res/drawable-xxhdpi/ic_phonelink_white_36dp.png
+++ b/res/drawable-xxhdpi/ic_phonelink_white_36dp.png
--- a/res/drawable-xxhdpi/ic_reject_pairing.png
+++ b/res/drawable-xxhdpi/ic_reject_pairing.png
--- a/res/drawable-xxhdpi/ic_volume.png
+++ b/res/drawable-xxhdpi/ic_volume.png
--- a/res/drawable-xxhdpi/mpris_plugin_action.png
+++ b/res/drawable-xxhdpi/mpris_plugin_action.png
--- a/res/drawable-xxhdpi/runcommand_plugin_icon.png
+++ b/res/drawable-xxhdpi/runcommand_plugin_icon.png
--- a/res/drawable-xxhdpi/share_plugin_action.png
+++ b/res/drawable-xxhdpi/share_plugin_action.png
--- a/res/drawable-xxxhdpi/ic_accept_pairing.png
+++ b/res/drawable-xxxhdpi/ic_accept_pairing.png
--- a/res/drawable-xxxhdpi/ic_error_outline_black_48dp.png
+++ b/res/drawable-xxxhdpi/ic_error_outline_black_48dp.png
--- a/res/drawable-xxxhdpi/ic_keyboard_hide_white_36dp.png
+++ b/res/drawable-xxxhdpi/ic_keyboard_hide_white_36dp.png
--- a/res/drawable-xxxhdpi/ic_phonelink_off_white_36dp.png
+++ b/res/drawable-xxxhdpi/ic_phonelink_off_white_36dp.png
--- a/res/drawable-xxxhdpi/ic_phonelink_white_36dp.png
+++ b/res/drawable-xxxhdpi/ic_phonelink_white_36dp.png
--- a/res/drawable-xxxhdpi/ic_reject_pairing.png
+++ b/res/drawable-xxxhdpi/ic_reject_pairing.png
--- a/res/drawable-xxxhdpi/ic_volume.png
+++ b/res/drawable-xxxhdpi/ic_volume.png
--- a/res/drawable-xxxhdpi/mpris_plugin_action.png
+++ b/res/drawable-xxxhdpi/mpris_plugin_action.png
--- a/res/drawable-xxxhdpi/runcommand_plugin_icon.png
+++ b/res/drawable-xxxhdpi/runcommand_plugin_icon.png
--- a/res/drawable-xxxhdpi/share_plugin_action.png
+++ b/res/drawable-xxxhdpi/share_plugin_action.png
--- a/res/drawable/disableable_button.xml
+++ b/res/drawable/disableable_button.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" android:color="@color/primary" />
-    <item android:state_enabled="false" android:color="@color/disabled_grey" />
-</selector>
--- a/res/drawable/ic_add.xml
+++ b/res/drawable/ic_add.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
-    <path
-        android:pathData="M0 0h24v24H0z" />
-</vector>
--- a/res/drawable/ic_album_art_placeholder.xml
+++ b/res/drawable/ic_album_art_placeholder.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="192dp"
-        android:height="192dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#000000"
-        android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/>
-</vector>
--- a/res/drawable/ic_fast_forward_black.xml
+++ b/res/drawable/ic_fast_forward_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
-</vector>
--- a/res/drawable/ic_next_black.xml
+++ b/res/drawable/ic_next_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
-</vector>
--- a/res/drawable/ic_next_white.xml
+++ b/res/drawable/ic_next_white.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
-</vector>
--- a/res/drawable/ic_pause_black.xml
+++ b/res/drawable/ic_pause_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
-</vector>
--- a/res/drawable/ic_pause_white.xml
+++ b/res/drawable/ic_pause_white.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
-</vector>
--- a/res/drawable/ic_play_black.xml
+++ b/res/drawable/ic_play_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8,5v14l11,-7z"/>
-</vector>
--- a/res/drawable/ic_play_white.xml
+++ b/res/drawable/ic_play_white.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M8,5v14l11,-7z"/>
-</vector>
--- a/res/drawable/ic_previous_black.xml
+++ b/res/drawable/ic_previous_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
-</vector>
--- a/res/drawable/ic_previous_white.xml
+++ b/res/drawable/ic_previous_white.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
-</vector>
--- a/res/drawable/ic_rewind_black.xml
+++ b/res/drawable/ic_rewind_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
-</vector>
--- a/res/drawable/ic_share_white.xml
+++ b/res/drawable/ic_share_white.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-</vector>
--- a/res/drawable/ic_volume_black.xml
+++ b/res/drawable/ic_volume_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z"/>
-</vector>
--- a/res/drawable/state_list_drawer_background_dark.xml
+++ b/res/drawable/state_list_drawer_background_dark.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/primary" android:state_checked="true" />
-    <item android:drawable="@color/darkStatusBarBackground" android:state_checked="false" />
-</selector>
--- a/res/layout-land/activity_mpris.xml
+++ b/res/layout-land/activity_mpris.xml
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:paddingBottom="25dp"
-    android:paddingLeft="25dp"
-    android:paddingRight="25dp"
-    android:paddingTop="25dp">
-
-    <ImageView
-        android:id="@+id/album_art"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_marginRight="25dp"
-        android:layout_marginEnd="25dp"
-        android:layout_weight="1"
-        android:contentDescription="@string/mpris_coverart_description"
-        android:scaleType="fitCenter" />
-
-    <include
-        layout="@layout/mpris_control"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1" />
-
-</LinearLayout>
--- a/res/layout-v14/nav_dark_mode_switch.xml
+++ b/res/layout-v14/nav_dark_mode_switch.xml
@@ -1,18 +0,0 @@
-<android.support.v7.widget.SwitchCompat
-    android:id="@+id/dark_theme"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:paddingBottom="16dp"
-    android:paddingEnd="48dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="48dp"
-    android:paddingStart="16dp"
-    android:paddingTop="4dp"
-    android:text="@string/dark_theme"
-    android:textColor="@android:color/white"
-    app:switchPadding="12dp"
-    tools:background="@drawable/drawer_header"
-    />
--- a/res/layout/activity_device.xml
+++ b/res/layout/activity_device.xml
@@ -1,120 +1,90 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:orientation="vertical"
    android:padding="@dimen/activity_vertical_margin"
-    tools:context="org.kde.kdeconnect.UserInterface.DeviceFragment">
+    tools:context=".DeviceFragment"
+    android:orientation="vertical">

    <LinearLayout
-        android:id="@+id/pairing_buttons"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:visibility="gone"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:id="@+id/pairing_buttons"
+        android:layout_gravity="center">

        <ProgressBar
-            android:id="@+id/pair_progress"
+            android:visibility="gone"
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
-            android:visibility="gone" />
+            android:id="@+id/pair_progress" />

        <TextView
-            android:id="@+id/pair_message"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginBottom="8dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
            android:text="@string/device_not_paired"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:id="@+id/pair_message"
+            android:layout_gravity="left|center_vertical"
+        />

        <Button
            android:id="@+id/pair_button"
+            android:background="@drawable/button_round"
+            android:textColor="@android:color/white"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:background="@drawable/button_round"
            android:text="@string/request_pairing"
-            android:textColor="@android:color/white" />
+        />


        <LinearLayout
-            android:id="@+id/pair_request"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:visibility="gone">
+            android:visibility="gone"
+            android:id="@+id/pair_request"
+            android:layout_gravity="center">

            <Button
+                android:background="@drawable/button_round"
+                android:textColor="@android:color/white"
+                android:layout_margin="4dip"
                android:id="@+id/accept_button"
                android:layout_width="fill_parent"
                android:layout_height="wrap_content"
-                android:layout_margin="4dip"
-                android:layout_weight="1"
-                android:background="@drawable/button_round"
                android:text="@string/pairing_accept"
-                android:textColor="@android:color/white" />
+                android:layout_weight="1"
+            />

            <Button
+                android:background="@drawable/button_round"
+                android:textColor="@android:color/white"
+                android:layout_margin="4dip"
                android:id="@+id/reject_button"
                android:layout_width="fill_parent"
                android:layout_height="wrap_content"
-                android:layout_margin="4dip"
-                android:layout_weight="1"
-                android:background="@drawable/button_round"
                android:text="@string/pairing_reject"
-                android:textColor="@android:color/white" />
+                android:layout_weight="1" />

        </LinearLayout>
    </LinearLayout>

-    <LinearLayout
-        android:id="@+id/error_message_container"
+    <TextView
+        android:id="@+id/unpair_message"
+        android:visibility="gone"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:visibility="gone" >
-
-        <android.support.v7.widget.AppCompatImageView
-            android:id="@+id/error_message_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:importantForAccessibility="no"
-            android:paddingEnd="8dip"
-            android:paddingLeft="0dip"
-            android:paddingRight="8dip"
-            android:paddingStart="0dip"
-            android:src="@drawable/ic_error_outline_black_48dp"
-            app:tint="?attr/colorHighContrast"
-            tools:ignore="UnusedAttribute"/>
-
-        <TextView
-            android:id="@+id/not_reachable_message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:text="@string/unreachable_description"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/on_data_message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:text="@string/on_data_message"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="gone" />
-    </LinearLayout>
-
+        android:text="@string/unreachable_description"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:gravity="center" />

    <ListView
        android:id="@+id/buttons_list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:fillViewport="true"
-        tools:context=".DeviceActivity" />
+        tools:context=".DeviceActivity"
+        />

 </LinearLayout>
--- a/res/layout/activity_find_my_phone.xml
+++ b/res/layout/activity_find_my_phone.xml
@@ -1,23 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="org.kde.kdeconnect.Plugins.FindMyPhonePlugin.FindMyPhoneActivity">
-
-
-    <Button
-        android:id="@+id/bFindMyPhone"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:text="@string/findmyphone_found"
-        android:textSize="50sp" />
-
-
-</RelativeLayout>
--- a/res/layout/activity_list.xml
+++ b/res/layout/activity_list.xml
@@ -0,0 +1,11 @@
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="16dip"
+    android:paddingRight="16dip"
+    tools:context=".MainActivity"
+    android:id="@+id/listView1"
+    android:addStatesFromChildren="true"
+    android:orientation="vertical">
+</ListView>
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -1,37 +1,40 @@
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<android.support.v4.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/drawer_layout"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:fitsSystemWindows="true"
-    tools:context="org.kde.kdeconnect.UserInterface.MainActivity">  <!-- fitSystemWindows to make the drawer slide below the Lollipop transparent status bar -->
+    tools:context="org.kde.kdeconnect.UserInterface.MaterialActivity">  <!-- fitSystemWindows to make the drawer slide below the Lollipop transparent status bar -->

    <LinearLayout
-        android:layout_width="match_parent"
        android:layout_height="match_parent"
+        android:layout_width="match_parent"
        android:orientation="vertical">
-
        <android.support.v7.widget.Toolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
-            android:elevation="8dp"
-            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
-
+            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+            android:background="?attr/colorPrimary" />
        <FrameLayout
            android:id="@+id/container"
            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
+            android:layout_height="match_parent">
+        </FrameLayout>
    </LinearLayout>

    <android.support.design.widget.NavigationView
        android:id="@+id/navigation_drawer"
+        app:itemBackground="@drawable/state_list_drawer_background"
+        app:itemTextColor="@color/state_list_drawer_text"
+        app:itemIconTint="@color/state_list_drawer_text"
        android:layout_width="wrap_content"
        android:layout_height="match_parent"
        android:layout_gravity="start"
        app:headerLayout="@layout/nav_header"
-        style="?attr/mainNavigationViewStyle" />
+        />

 </android.support.v4.widget.DrawerLayout>
--- a/res/layout/activity_mousepad.xml
+++ b/res/layout/activity_mousepad.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>

 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/mousepad_view"
+    android:keepScreenOn="true"
+    android:orientation="vertical"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:keepScreenOn="true"
-    android:orientation="vertical">
+    android:id="@+id/mousepad_view">

    <TextView
-        style="@android:style/TextAppearance.Medium"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
+        android:text="@string/mousepad_info"
        android:gravity="center"
-        android:padding="12dip"
-        android:text="@string/mousepad_info" />
+        style="@android:style/TextAppearance.Medium"
+        android:layout_centerInParent="true"
+        android:padding="12dip" />

    <view
-        android:id="@+id/keyListener"
-        class="org.kde.kdeconnect.Plugins.MousePadPlugin.KeyListenerView"
        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        class="org.kde.kdeconnect.Plugins.MousePadPlugin.KeyListenerView"
+        android:id="@+id/keyListener" />

 </RelativeLayout>
--- a/res/layout/activity_mpris.xml
+++ b/res/layout/activity_mpris.xml
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="25dp"
-    android:paddingLeft="25dp"
-    android:paddingRight="25dp"
-    android:paddingTop="25dp">
-
-    <ImageView
-        android:id="@+id/album_art"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginBottom="25dp"
-        android:layout_weight="4"
-        android:contentDescription="@string/mpris_coverart_description"
-        android:scaleType="fitCenter" />
-
-    <include
-        layout="@layout/mpris_control"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
--- a/res/layout/activity_notification_filter.xml
+++ b/res/layout/activity_notification_filter.xml
@@ -1,31 +1,22 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
    tools:context="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationFilterActivity">

    <TextView
-        android:id="@+id/tFilter"
+        android:text="@string/filter_apps_info"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:paddingBottom="5dp"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin"
-        android:text="@string/filter_apps_info" />
-
-    <ProgressBar
-        android:id="@+id/spinner"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="64dip" />
+        android:id="@+id/tFilter"/>

    <ListView
-        android:id="@+id/lvFilterApps"
        android:layout_width="fill_parent"
        android:layout_height="fill_parent"
-        android:visibility="gone" />
+        android:id="@+id/lvFilterApps"
+        android:layout_below="@id/tFilter"/>

-</LinearLayout>
+</RelativeLayout>
--- a/res/layout/activity_runcommand.xml
+++ b/res/layout/activity_runcommand.xml
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ListView
-        android:id="@+id/runcommandslist"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="4dp"
-        android:addStatesFromChildren="true"
-        android:orientation="vertical" />
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/add_command_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        android:src="@drawable/ic_action_image_edit"
-        app:backgroundTint="@color/primary"
-        app:layout_anchor="@id/runcommandslist"
-        app:layout_anchorGravity="bottom|end" />
-
-    <TextView
-        android:id="@+id/addcomand_explanation"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:padding="30dp"
-        android:text="@string/addcommand_explanation"
-        android:textAlignment="center"
-        android:textSize="16sp" />
-
-</android.support.design.widget.CoordinatorLayout>
--- a/res/layout/custom_ip_list.xml
+++ b/res/layout/custom_ip_list.xml
@@ -1,35 +1,36 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
    android:paddingLeft="@dimen/activity_horizontal_margin"
    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin">
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:orientation="vertical">

    <ListView
-        android:id="@android:id/list"
        android:layout_width="fill_parent"
        android:layout_height="0dp"
-        android:layout_weight="1" />
+        android:id="@android:id/list"
+        android:layout_weight="1"
+    />

    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="100dp"
-        android:text="@string/custom_dev_list_help" />
+            android:layout_width="fill_parent"
+            android:layout_height="100dp"
+            android:text="@string/custom_dev_list_help"/>

    <EditText
-        android:id="@+id/ip_edittext"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/add_host_hint"
-        android:imeOptions="actionSend" />
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="actionSend"
+            android:hint="@string/add_host_hint"
+            android:id="@+id/ip_edittext"/>

    <Button
-        android:id="@android:id/button1"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/add_host" />
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/add_host"
+            android:id="@android:id/button1"/>


 </LinearLayout>
--- a/res/layout/devices_list.xml
+++ b/res/layout/devices_list.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/refresh_list_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ListView
-        android:id="@+id/devices_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:addStatesFromChildren="true"
-        android:orientation="vertical"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
-        tools:context=".MainActivity" />
-
-</android.support.v4.widget.SwipeRefreshLayout>
--- a/res/layout/list_item_category.xml
+++ b/res/layout/list_item_category.xml
@@ -1,31 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">

    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/list_item_category_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
        android:drawableBottom="@drawable/text_section_header"
+        android:textStyle="bold"
+        android:layout_marginTop="8dp"
+        android:textColor="?android:textColorSecondary"
        android:drawablePadding="4dp"
+        android:textSize="14sp"
+        android:textAllCaps="true"
        android:paddingLeft="8dip"
        android:paddingRight="8dip"
-        android:textAllCaps="true"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="14sp"
-        android:textStyle="bold" />
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:id="@+id/list_item_category_text"
+        />

    <TextView
-        android:id="@+id/list_item_category_empty_placeholder"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_gravity="center"
        android:layout_margin="10dip"
-        android:text="@string/device_list_empty"
+        android:visibility="gone"
        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:visibility="gone" />
+        android:text="@string/device_list_empty"
+        android:id="@+id/list_item_category_empty_placeholder"
+        android:layout_gravity="center" />
+

 </LinearLayout>
--- a/res/layout/list_item_entry.xml
+++ b/res/layout/list_item_entry.xml
@@ -1,38 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/abc_list_selector_holo_dark"
    android:baselineAligned="false"
-    android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="vertical"
-    android:paddingEnd="?android:attr/scrollbarSize"
+    android:layout_height="wrap_content"
    android:paddingLeft="12dip"
+    android:paddingStart="12dip"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingStart="12dip">
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:background="@drawable/abc_list_selector_holo_dark"
+    android:orientation="vertical">
    <!-- We should use android:background="@android:/listChoiceBackgroundIndicator"
         instead of abc_list_selector_holo_dark but that's only supported from API11 -->

-    <TextView
-        android:id="@+id/list_item_entry_title"
+    <TextView android:id="@+id/list_item_entry_title"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceLarge"
        android:ellipsize="marquee"
        android:fadingEdge="horizontal"
-        android:singleLine="true"
-        android:text=""
-        android:textAppearance="?android:attr/textAppearanceLarge" />
+        android:text="" />

-    <TextView
-        android:id="@+id/list_item_entry_summary"
+    <TextView android:id="@+id/list_item_entry_summary"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:text=""
        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="@android:color/darker_gray"
-        android:visibility="gone" />
+        android:singleLine="true"
+        android:textColor="#CC2222"
+        android:visibility="gone"
+        android:text="" />
+

 </LinearLayout>
--- a/res/layout/list_item_with_button_entry.xml
+++ b/res/layout/list_item_with_button_entry.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:baselineAligned="false"
+    android:layout_height="wrap_content"
+    android:paddingLeft="12dip"
+    android:paddingStart="12dip"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:orientation="horizontal">
+
+        <ImageView android:id="@+id/list_item_entry_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:src="@drawable/ic_device_laptop"
+            android:layout_weight="0" />
+
+    <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_weight="1"
+            android:layout_height="wrap_content">
+
+        <TextView android:id="@+id/list_item_entry_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="8dip"
+                android:layout_marginStart="8dip"
+                android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:text=""/>
+
+
+        <TextView android:id="@+id/list_item_entry_summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:singleLine="true"
+                android:textColor="#CC2222"
+                android:visibility="gone"
+                android:text="" />
+
+        </LinearLayout>
+
+
+    <ProgressBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/progressBar"
+        android:layout_weight="0"
+        android:indeterminate="true" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:minWidth="128dip"
+        android:layout_height="wrap_content"
+        android:text="@string/request_pairing"
+        android:padding="8dip"
+        android:background="@drawable/button_round"
+        android:textColor="#FFFFFF"
+        android:id="@+id/entry_pair_button"
+        android:layout_weight="0"
+        android:nestedScrollingEnabled="false" />
+
+</LinearLayout>
+
+
--- a/res/layout/list_item_with_icon_entry.xml
+++ b/res/layout/list_item_with_icon_entry.xml
@@ -1,59 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/abc_list_selector_holo_dark"
    android:baselineAligned="false"
-    android:clickable="true"
-    android:focusable="true"
-    android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:paddingEnd="?android:attr/scrollbarSize"
+    android:layout_height="wrap_content"
    android:paddingLeft="12dip"
+    android:paddingStart="12dip"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingStart="12dip">
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:clickable="true"
+    android:background="@drawable/abc_list_selector_holo_dark"
+    android:orientation="horizontal">

-    <android.support.v7.widget.AppCompatImageView
-        android:id="@+id/list_item_entry_icon"
+    <ImageView android:id="@+id/list_item_entry_icon"
        android:layout_width="wrap_content"
        android:layout_height="match_parent"
        android:layout_gravity="center_vertical"
-        android:contentDescription="@string/device_icon_description"
-        app:tint="?attr/colorControlNormal"
-        android:src="@drawable/ic_device_laptop" />
+        android:src="@drawable/ic_device_laptop"
+        />

    <LinearLayout
        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:layout_height="wrap_content">

-        <TextView
-            android:id="@+id/list_item_entry_title"
+        <TextView android:id="@+id/list_item_entry_title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center_vertical"
            android:layout_marginLeft="8dip"
            android:layout_marginStart="8dip"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
            android:ellipsize="marquee"
            android:fadingEdge="horizontal"
-            android:singleLine="true"
-            android:text=""
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:text="" />

-        <TextView
-            android:id="@+id/list_item_entry_summary"
+        <TextView android:id="@+id/list_item_entry_summary"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginLeft="8dip"
            android:layout_marginStart="8dip"
-            android:singleLine="true"
-            android:text=""
            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:singleLine="true"
            android:textColor="#CC2222"
-            android:visibility="gone" />
+            android:visibility="gone"
+            android:text="" />

    </LinearLayout>

--- a/res/layout/mpris_control.xml
+++ b/res/layout/mpris_control.xml
@@ -2,162 +2,182 @@

 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/mpris_control_view"
+    android:orientation="vertical"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:layout_gravity="center"
+    android:id="@+id/mpris_control_view"
    android:gravity="center"
-    android:orientation="vertical">
+    android:paddingLeft="60dip"
+    android:paddingTop="5dip"
+    android:paddingRight="60dip"
+    android:paddingBottom="5dip">

    <TextView
-        android:id="@+id/no_players"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
+        android:textAppearance="?android:attr/textAppearanceMedium"
        android:text="@string/no_players_connected"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:id="@+id/no_players"
+        android:layout_gravity="center_horizontal" />

    <Spinner
-        android:id="@+id/player_spinner"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_gravity="center" />
+        android:id="@+id/player_spinner"
+        android:layout_gravity="center"
+    />

    <TextView
-        android:id="@+id/now_playing_textview"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="marquee"
-        android:gravity="center"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:padding="8dip"
-        android:scrollHorizontally="true"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:id="@+id/now_playing_textview"
        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:gravity="center"
+        android:padding="8dip"
+        android:layout_gravity="center"
+    />

-    <ImageButton
-        android:id="@+id/play_button"
+    <org.kde.kdeconnect.UserInterface.MaxWidthImageButton
        android:layout_width="fill_parent"
-        android:layout_height="75dp"
+        android:layout_height="75dip"
+        app:maxWidth="300dip"
+        android:id="@+id/play_button"
+        android:src="@android:drawable/ic_media_play"
+        android:contentDescription="@string/mpris_play"
        android:layout_gravity="center"
        android:layout_weight="0"
-        android:adjustViewBounds="false"
-        android:baselineAlignBottom="true"
        android:clickable="false"
-        android:contentDescription="@string/mpris_play"
-        android:theme="@style/DisableableButton"
-        android:src="@drawable/ic_play_black" />
+        android:adjustViewBounds="false"
+        android:baselineAlignBottom="true" />

    <LinearLayout
+        android:orientation="horizontal"
        android:layout_width="match_parent"
        android:layout_height="60dip"
        android:layout_gravity="center"
-        android:orientation="horizontal">
+    >

        <ImageButton
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
            android:id="@+id/prev_button"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:layout_weight="0.25"
+            android:src="@android:drawable/ic_media_previous"
            android:contentDescription="@string/mpris_previous"
-            android:theme="@style/DisableableButton"
-            android:src="@drawable/ic_previous_black" />
+            android:layout_weight="0.25"
+        />

        <ImageButton
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
            android:id="@+id/rew_button"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:layout_weight="0.25"
+            android:src="@android:drawable/ic_media_rew"
            android:contentDescription="@string/mpris_rew"
-            android:theme="@style/DisableableButton"
-            android:src="@drawable/ic_rewind_black" />
+            android:layout_weight="0.25"
+        />

        <ImageButton
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
            android:id="@+id/ff_button"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:layout_weight="0.25"
+            android:src="@android:drawable/ic_media_ff"
            android:contentDescription="@string/mpris_ff"
-            android:theme="@style/DisableableButton"
-            android:src="@drawable/ic_fast_forward_black" />
+            android:layout_weight="0.25"
+        />

        <ImageButton
-            android:id="@+id/next_button"
            android:layout_width="match_parent"
            android:layout_height="fill_parent"
-            android:layout_weight="0.25"
+            android:id="@+id/next_button"
+            android:src="@android:drawable/ic_media_next"
            android:contentDescription="@string/mpris_next"
-            android:theme="@style/DisableableButton"
-            android:src="@drawable/ic_next_black" />
+            android:layout_weight="0.25"
+        />

    </LinearLayout>

    <LinearLayout
-        android:id="@+id/progress_slider"
+        android:orientation="horizontal"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:id="@+id/progress_slider">

        <TextView
-            android:id="@+id/progress_textview"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:id="@+id/progress_textview"
+            android:singleLine="true"
            android:gravity="center"
            android:padding="8dip"
-            android:singleLine="true"
-            android:text="00:00"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:layout_gravity="center"
+            android:text="00:00" />

        <SeekBar
-            android:id="@+id/positionSeek"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="1" />
+            android:id="@+id/positionSeek"
+            android:layout_weight="1"
+            android:layout_gravity="center" />

        <TextView
-            android:id="@+id/time_textview"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:id="@+id/time_textview"
+            android:singleLine="true"
            android:gravity="center"
            android:padding="8dip"
-            android:singleLine="true"
-            android:text="00:00"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:layout_gravity="center"
+            android:text="00:00" />
    </LinearLayout>

    <LinearLayout
-        android:id="@+id/volume_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="8dip"
-        android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/volume_layout"
+            android:layout_gravity="center"
+        android:layout_marginTop="8dip">

-        <android.support.v7.widget.AppCompatImageView
-            android:id="@+id/imageView"
+        <ImageView
            android:layout_width="30dip"
            android:layout_height="30dip"
-            android:layout_marginEnd="10dip"
-            android:layout_marginRight="10dip"
-            android:layout_weight="0"
-            android:contentDescription="@string/mpris_volume"
            android:maxWidth="30dip"
-            app:tint="?attr/colorHighContrast"
-            android:src="@drawable/ic_volume_black" />
+            android:layout_marginRight="10dip"
+            android:layout_marginEnd="10dip"
+            android:id="@+id/imageView"
+            android:layout_weight="0"
+            android:layout_gravity="left|center_vertical"
+            android:contentDescription="@string/mpris_volume"
+            android:src="@drawable/ic_volume"
+        />


        <SeekBar
-            android:id="@+id/volume_seek"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:id="@+id/volume_seek"
            android:layout_weight="1"
-            android:max="100" />
+            android:max="100"
+            android:layout_gravity="center"
+        />

    </LinearLayout>

+    <!--
+        <ImageButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/pause_button"
+                android:src="@android:drawable/ic_media_pause"
+                android:layout_gravity="center"/>
+
+        <ImageButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/pause_button"
+                android:src="@android:drawable/ic_media_stop"
+                android:layout_gravity="center"/>
+    -->
 </LinearLayout>
--- a/res/layout/nav_header.xml
+++ b/res/layout/nav_header.xml
@@ -1,36 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="160dp"
    android:background="@drawable/drawer_header"
-    android:gravity="bottom"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:gravity="bottom">
+

    <TextView
-        android:id="@+id/kdeconnect_label"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:paddingEnd="48dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="48dp"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
        android:text="KDE Connect"
        android:textColor="#FFF"
-        android:textStyle="bold" />
+        android:textStyle="bold"
+        android:layout_above="@+id/device_name"
+        android:id="@+id/kdeconnect_label"
+        android:paddingLeft="16dp"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp"
+        android:paddingRight="48dp"
+        android:paddingEnd="48dp"
+        />

    <TextView
-        android:id="@+id/device_name"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginBottom="0dp"
-        android:paddingBottom="16dp"
-        android:paddingEnd="48dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="48dp"
-        android:paddingStart="16dp"
-        android:paddingTop="4dp"
        android:text="My device"
-        android:textColor="#fff" />
+        android:id="@+id/device_name"
+        android:layout_marginBottom="0dp"
+        android:textColor="#fff"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:paddingBottom="16dp"
+        android:paddingTop="4dp"
+        android:paddingRight="48dp"
+        android:paddingEnd="48dp"
+        android:paddingStart="16dp"
+        android:paddingLeft="16dp" />

-</LinearLayout>
+    <!--
+    <ImageView
+        android:src="@drawable/ic_action_image_edit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:clickable="true"
+        android:background="@drawable/abc_list_selector_holo_dark"
+        android:layout_gravity="center_vertical"
+        android:contentDescription="@string/rename_device"
+        android:id="@+id/rename"
+    />
+    -->
+
+</RelativeLayout>
--- a/res/layout/preference_with_button.xml
+++ b/res/layout/preference_with_button.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2006 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,68 +17,67 @@
 <!-- Layout for a Preference in a PreferenceActivity. The
     Preference is able to place a specific widget for its particular
     type in the "widget_frame" layout. -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:res="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:gravity="center_vertical"
    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
    android:paddingEnd="?android:attr/scrollbarSize"
-    android:paddingLeft="12dip"
    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingStart="12dip">
+    android:background="?attr/selectableItemBackground" >

-    <!-- Preference will place its actual preference widget here. -->
-    <LinearLayout
-        android:id="@android:id/widget_frame"
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout android:id="@+android:id/widget_frame"
        android:layout_width="wrap_content"
        android:layout_height="match_parent"
        android:gravity="center_vertical"
        android:orientation="vertical" />

+    <ImageView
+        android:id="@+android:id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        />
+
    <RelativeLayout
        android:layout_width="0dp"
        android:layout_height="wrap_content"
-        android:layout_marginBottom="6dip"
-        android:layout_marginEnd="4dip"
-        android:layout_marginLeft="12dip"
+        android:layout_marginStart="15dip"
+        android:layout_marginLeft="15dip"
+        android:layout_marginEnd="15dip"
        android:layout_marginRight="4dip"
-        android:layout_marginStart="12dip"
        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
        android:layout_weight="1">

-        <TextView
-            android:id="@+android:id/title"
+        <TextView android:id="@+android:id/title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />

-        <TextView
-            android:id="@android:id/summary"
+        <TextView android:id="@+android:id/summary"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_alignLeft="@android:id/title"
-            android:layout_alignStart="@android:id/title"
            android:layout_below="@android:id/title"
-            android:maxLines="3"
+            android:layout_alignStart="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="?android:attr/textColorSecondary"
+            android:maxLines="3" />

    </RelativeLayout>

-    <android.support.v7.widget.AppCompatImageButton
-        android:id="@+id/settingsButton"
+    <ImageButton
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:background="@drawable/abc_btn_borderless_material"
-        android:contentDescription="@string/settings_icon_description"
+        android:id="@+id/settingsButton"
        android:padding="8dip"
-        app:tint="?attr/colorControlNormal"
-        android:src="@drawable/ic_action_settings_inverted" />
+        android:background="@drawable/abc_btn_borderless_material"
+        android:src="@drawable/ic_action_settings_inverted"/>

 </LinearLayout>
--- a/res/menu/menu_mousepad.xml
+++ b/res/menu/menu_mousepad.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:kdeconnect="http://schemas.android.com/apk/res-auto">
+xmlns:kdeconnect="http://schemas.android.com/apk/res-auto/android">

-    <item
-        android:id="@+id/menu_show_keyboard"
-        android:icon="@drawable/ic_action_keyboard"
+    <item android:id="@+id/menu_show_keyboard"
        android:title="@string/show_keyboard"
+        android:icon="@drawable/ic_action_keyboard"
        kdeconnect:showAsAction="ifRoom" />

-    <item
-        android:id="@+id/menu_right_click"
+    <item android:id="@+id/menu_right_click"
        android:title="@string/right_click"
        kdeconnect:showAsAction="never" />

-    <item
-        android:id="@+id/menu_middle_click"
+    <item android:id="@+id/menu_middle_click"
        android:title="@string/middle_click"
        kdeconnect:showAsAction="never" />

--- a/res/menu/pairing.xml
+++ b/res/menu/pairing.xml
@@ -5,19 +5,30 @@
        android:id="@+id/menu_refresh"
        android:icon="@drawable/ic_action_refresh"
        android:orderInCategory="200"
+        kdeconnect:showAsAction="never"
        android:title="@string/refresh"
-        kdeconnect:showAsAction="never" />
+        />
+
+    <item
+            android:id="@+id/menu_progress"
+            android:orderInCategory="200"
+            android:visible="false"
+            kdeconnect:showAsAction="ifRoom"
+            kdeconnect:actionViewClass="android.widget.ProgressBar"
+        />

    <item
        android:id="@+id/menu_rename"
        android:orderInCategory="300"
        android:title="@string/device_rename_title"
-        kdeconnect:showAsAction="never" />
+        kdeconnect:showAsAction="never"
+        />

-    <item
+       <item
        android:id="@+id/menu_custom_device_list"
        android:orderInCategory="900"
        android:title="@string/custom_device_list"
-        kdeconnect:showAsAction="never" />
+        kdeconnect:showAsAction="never"
+        />

 </menu>
--- a/res/menu/refresh.xml
+++ b/res/menu/refresh.xml
@@ -2,10 +2,19 @@
    xmlns:kdeconnect="http://schemas.android.com/apk/res-auto/android">

    <item
-        android:id="@+id/menu_refresh"
-        android:icon="@drawable/ic_action_refresh"
-        android:orderInCategory="200"
-        android:title="@string/refresh"
-        kdeconnect:showAsAction="never" />
+            android:id="@+id/menu_refresh"
+            android:icon="@drawable/ic_action_refresh"
+            android:orderInCategory="200"
+            kdeconnect:showAsAction="ifRoom"
+            android:title="@string/refresh"
+        />
+
+    <item
+            android:id="@+id/menu_progress"
+            android:orderInCategory="200"
+            android:visible="false"
+            kdeconnect:showAsAction="ifRoom"
+            kdeconnect:actionViewClass="android.widget.ProgressBar"
+        />

 </menu>
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -5,23 +5,16 @@
  <string name="pref_plugin_battery">تقرير البطّاريّة</string>
  <string name="pref_plugin_battery_desc">بلّغ عن حالة البطّاريّة دوريًّا</string>
  <string name="pref_plugin_sftp">اكشف نظام الملفّات</string>
-  <string name="pref_plugin_sftp_desc">تسمح بتصفّح نظام ملفّات هذا الهاتف عن بعد</string>
+  <string name="pref_plugin_sftp_desc">تسمح بتصفّح نظام ملفّات الهاتف عن بعد</string>
  <string name="pref_plugin_clipboard">مزامنة الحافظة</string>
  <string name="pref_plugin_clipboard_desc">شارك محتوى الحافظة</string>
-  <string name="pref_plugin_mousepad">الدّخل البعيد</string>
-  <string name="pref_plugin_mousepad_desc">استخدم الهاتف أو اللوحيّ كفأرة ولوحة مفاتيح</string>
-  <string name="pref_plugin_mpris">تحكّمات الوسائط المتعدّدة</string>
-  <string name="pref_plugin_mpris_desc">توفّر تحكّمًا بعيدًا لمشغّل الوسائط</string>
-  <string name="pref_plugin_runcommand">شغّل أمرًا</string>
-  <string name="pref_plugin_runcommand_desc">تحفّز أوامر عن بعد من الهاتف أو اللوحيّ</string>
+  <string name="pref_plugin_mousepad">الدَّخل البعيد</string>
+  <string name="pref_plugin_mousepad_desc">استخدم هاتفك كفأرة ولوحة مفاتيح</string>
+  <string name="pref_plugin_mpris_desc">تحكّم بالصّوت والصّورة من هاتفك</string>
  <string name="pref_plugin_ping">وخزة</string>
  <string name="pref_plugin_ping_desc">أرسل واستقبل وخزات</string>
  <string name="pref_plugin_notifications">مزامنة الإخطارات</string>
  <string name="pref_plugin_notifications_desc">انفذ إلى إخطاراتك من أجهزة أخرى</string>
-  <string name="pref_plugin_receive_notifications">استقبل الإخطارات</string>
-  <string name="pref_plugin_receive_notifications_desc">استقبل الإخطارات من الجهاز الآخر واعرضها على أندرويد</string>
-  <string name="pref_plugin_sharereceiver">شارك واستقبل</string>
-  <string name="pref_plugin_sharereceiver_desc">شارك الملفّات والعناوين بين الجهازين</string>
  <string name="plugin_not_available">هذه الميزة غير متوفّرة في إصدار أندرويد لديك</string>
  <string name="device_list_empty">لا أجهزة</string>
  <string name="ok">حسنًا</string>
@@ -29,32 +22,17 @@
  <string name="open_settings">افتح الإعدادات</string>
  <string name="no_permissions">عليك إعطاء التّطبيق صلاحيّات للنّفاذ إلى الإخطارات</string>
  <string name="send_ping">أرسل وخزة</string>
-  <string name="open_mpris_controls">تحكّمات الوسائط المتعدّدة</string>
-  <string name="open_mousepad">الدّخل البعيد</string>
-  <string name="mousepad_double_tap_settings_title">اضبط إجراء اللمس بإصبعين</string>
-  <string name="mousepad_triple_tap_settings_title">اضبط إجراء اللمس بثلاث أصابع</string>
-  <string name="mousepad_sensitivity_settings_title">اضبط حساسيّة لوحة اللمس</string>
-  <string name="mousepad_scroll_direction_title">اعكس اتّجاه التّمرير</string>
  <string-array name="mousepad_tap_entries">
-    <item>النّقر باليمين</item>
-    <item>النّقر بالوسط</item>
-    <item>لا شيء</item>
-  </string-array>
-  <string-array name="mousepad_sensitivity_entries">
-    <item>الأبطأ</item>
-    <item>الأقل بطئًا</item>
-    <item>الافتراضيّ</item>
-    <item>الأسرع قليلًا</item>
-    <item>الأسرع</item>
+    <item/>
+    <item/>
+    <item>Nothing</item>
  </string-array>
  <string name="category_connected_devices">الأجهزة المقترن بها</string>
  <string name="category_not_paired_devices">الأجهزة المتوفّرة</string>
  <string name="category_remembered_devices">الأجهزة المتذكَّرة</string>
  <string name="plugins_failed_to_load">فشل تحميل الملحقات (المس لمعلومات اكثر):</string>
-  <string name="device_menu_plugins">إعدادات الملحقة</string>
-  <string name="device_menu_unpair">ألغِ الاقتران</string>
+  <string name="device_menu_unpair">أزل الاقتران</string>
  <string name="device_not_reachable">الجهاز المقترن غير قابل الوصول</string>
-  <string name="pair_new_device">اقرن جهازًا جديدًا</string>
  <string name="unknown_device">جهاز مجهول</string>
  <string name="error_not_reachable">الجهاز غير قابل الوصول</string>
  <string name="error_already_requested">طُلب الاقتران بالفعل</string>
@@ -64,23 +42,14 @@
  <string name="error_canceled_by_user">ألغاه المستخدم</string>
  <string name="error_canceled_by_other_peer">ألغاه ندّ آخر</string>
  <string name="error_invalid_key">استُقبل مفتاح غير صالح</string>
-  <string name="encryption_info_title">معلومات التّعمية</string>
-  <string name="encryption_info_msg_no_ssl">لا يستخدم الجهاز الآخر إصدارة حديثة من «كدي المتّصل»، ستُستخدم طريقة التّعمية القديمة.</string>
-  <string name="my_device_fingerprint">بصمة SHA1 لشهادة جهازك هي:</string>
-  <string name="remote_device_fingerprint">بصمة SHA1 لشهادة الجهاز البعيد هي:</string>
  <string name="pair_requested">طُلب الاقتران</string>
  <string name="pairing_request_from">طلب اقتران من %1s</string>
  <string name="received_url_title">استُلمت وصلة من %1s</string>
  <string name="received_url_text">المس لفتح \'%1s\'</string>
  <string name="incoming_file_title">ملفّ وارد من %1s</string>
  <string name="incoming_file_text">%1s</string>
-  <string name="outgoing_file_title">يرسل ملفًّا إلى %1s</string>
-  <string name="received_file_title">استُقبل ملفّ من %1s</string>
-  <string name="received_file_fail_title">فشل استقبال الملفّ من %1s</string>
+  <string name="received_file_title">استُلم ملفّ من %1s</string>
  <string name="received_file_text">المس لفتح \'%1s\'</string>
-  <string name="sent_file_title">أرسل ملفًّا إلى %1s</string>
-  <string name="sent_file_text">%1s</string>
-  <string name="sent_file_failed_text">%1s</string>
  <string name="tap_to_answer">المس للإجابة</string>
  <string name="reconnect">أعد الاتّصال</string>
  <string name="right_click">أرسل نقرة باليمين</string>
@@ -101,8 +70,6 @@
  <string name="mpris_next">التّالي</string>
  <string name="mpris_volume">المستوى</string>
  <string name="mpris_settings">إعدادات الوسائط المتعدّدة</string>
-  <string name="mpris_time_settings_title">زرّا التّقدّم والإرجاع</string>
-  <string name="mpris_time_settings_summary">اضبط الوقت عند نقر زرّيّ التّقديم أو الإرجاع.</string>
  <string-array name="mpris_time_entries">
    <item>10 ثوان</item>
    <item>20 ثانية</item>
@@ -121,13 +88,9 @@
  <string name="invalid_device_name">اسم جهاز غير صالح</string>
  <string name="shareplugin_text_saved">استُقبل نصّ، حُفظ إلى الحافظة</string>
  <string name="custom_devices_settings">قائمة أجهزة مخصّصة</string>
-  <string name="pair_device_action">اقرن جهازًا جديدًا</string>
-  <string name="unpair_device_action">ألغِ اقتران %s</string>
  <string name="custom_device_list">أضف أجهزة بميفاق الإنترنت مإ</string>
  <string name="share_notification_preference">إخطارات مزعجة</string>
  <string name="share_notification_preference_summary">اهتزّ وشغّل صوتًا عند استقبال ملفّ</string>
-  <string name="title_activity_notification_filter">مرشّح الإخطارات</string>
-  <string name="filter_apps_info">ستُزامن الإخطارات من التّطبيقات المحدّدة.</string>
  <string name="sftp_internal_storage">التّخزين الدّاخليّ</string>
  <string name="sftp_all_files">كلّ الملفّات</string>
  <string name="sftp_sdcard_num">بطاقة SD ‏%d</string>
@@ -135,26 +98,7 @@
  <string name="sftp_readonly">(للقراءة فقط)</string>
  <string name="sftp_camera">صور الكاميرا</string>
  <string name="add_host">أضف مضيفًا/مإ</string>
-  <string name="add_host_hint">اسم المضيف أو عنوان IP</string>
  <string name="no_players_connected">لم يُعثر على مشغّلات</string>
  <string name="custom_dev_list_help">استخدم هذا الخيار فقط إن لم يُكتَشف جهازك آليًّا. أدخِل عنوان مإ أو اسم المضيف أدناه والمس الزرّ لإضافته إلى القائمة. المس عنصرًا موجودًا لإزالته من القائمة.</string>
  <string name="mpris_player_on_device">%1$s على %2$s</string>
-  <string name="send_files">أرسل ملفّات</string>
-  <string name="pairing_title">أجهزة «كدي المتّصل»</string>
-  <string name="pairing_description">الأجهزة الأخرى التي تشغّل «كدي المتّصل» وعلى نفس الشّبكة ستظهر هنا.</string>
-  <string name="device_paired">اقتُرن الجهاز</string>
-  <string name="device_rename_title">أعد تسمية الجهاز</string>
-  <string name="device_rename_confirm">أعد التّسمية</string>
-  <string name="refresh">أنعش</string>
-  <string name="unreachable_description">الجهاز المقترن هذا لا يمكن الوصول إليه. تأكّد من اتّصاله بنفس الشّبكة.</string>
-  <string name="no_file_browser">لا متصفّحات ملفّات مثبّتة.</string>
-  <string name="pref_plugin_telepathy">أرسل SMS</string>
-  <string name="pref_plugin_telepathy_desc">أرسل رسائل نصّيّة من سطح المكتب</string>
-  <string name="plugin_not_supported">لا يدعم جهازك هذه الملحقة</string>
-  <string name="findmyphone_title">جِد جهازي</string>
-  <string name="findmyphone_title_tablet">جِد جهازي اللوحيّ</string>
-  <string name="findmyphone_description">يرّن هذا الجهاز لتجده</string>
-  <string name="findmyphone_found">وُجد</string>
-  <string name="open">افتح</string>
-  <string name="close">أغلق</string>
 </resources>
--- a/res/values-ast/strings.xml
+++ b/res/values-ast/strings.xml
@@ -1,57 +1,134 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="pref_plugin_telephony">Avisador telefónicu</string>
+  <string name="pref_plugin_telephony">Notificador telefónicu</string>
  <string name="pref_plugin_telephony_desc">Unvia avisos pa SMS y llamaes</string>
  <string name="pref_plugin_battery">Informe de batería</string>
-  <string name="pref_plugin_battery_desc">Informe periódicu del estáu de la batería</string>
-  <string name="pref_plugin_sftp_desc">Permite restolar remotamente a esti preséu</string>
+  <string name="pref_plugin_battery_desc">Infoma davezu del estáu de la batería</string>
+  <string name="pref_plugin_sftp_desc">Permite restolar remotamente\'l sistema de ficheros del teléfonu</string>
  <string name="pref_plugin_clipboard">Sincronización del cartafueyu</string>
  <string name="pref_plugin_clipboard_desc">Comparte\'l conteníu del cartafueyu</string>
  <string name="pref_plugin_mousepad">Entrada remota</string>
-  <string name="pref_plugin_mousepad_desc">Usa\'l to teléfonu o tableta como panel táutil y tecláu</string>
-  <string name="pref_plugin_remotekeyboard">Pulsaciones remotes</string>
-  <string name="pref_plugin_mpris">Controles multimedia</string>
-  <string name="pref_plugin_mpris_desc">Forne un control remotu pal to reproductor multimedia</string>
-  <string name="pref_plugin_runcommand">Execución de comandos</string>
-  <string name="pref_plugin_runcommand_desc">Aiciona comandos remotos del to teléfonu o tableta</string>
+  <string name="pref_plugin_mousepad_desc">Usa\'l to teléfonu como mur y tecláu</string>
+  <string name="pref_plugin_mpris">Controles remotos multimedia</string>
+  <string name="pref_plugin_mpris_desc">Controla audiu/videu dende\'l to teléfonu</string>
+  <string name="pref_plugin_runcommand_desc">Executa un comandu nel to sistema</string>
  <string name="pref_plugin_ping">Ping</string>
-  <string name="pref_plugin_ping_desc">Unvia y recibe pings</string>
+  <string name="pref_plugin_ping_desc">Unvia y recibi pings</string>
  <string name="pref_plugin_notifications">Sincronización d\'avisos</string>
-  <string name="pref_plugin_notifications_desc">Accede a los tos avisos d\'otros preseos</string>
-  <string name="pref_plugin_receive_notifications">Recibir avisos</string>
-  <string name="pref_plugin_receive_notifications_desc">Recibe avisos d\'otros preseos y amuésalos n\'Android</string>
-  <string name="pref_plugin_sharereceiver">Compartir y recibir</string>
+  <string name="pref_plugin_notifications_desc">Accede a los tos avisos dende otros preseos</string>
+  <string name="pref_plugin_sharereceiver">Unvia y recibi pings</string>
  <string name="pref_plugin_sharereceiver_desc">Comparte ficheros y URLs ente preseos</string>
  <string name="plugin_not_available">Esta carauterística nun ta disponible na to versión d\'Android</string>
  <string name="device_list_empty">Ensin preseos</string>
  <string name="ok">Aceutar</string>
  <string name="cancel">Encaboxar</string>
  <string name="open_settings">Abrir axustes</string>
-  <string name="no_permissions">¡</string>
+  <string name="no_permissions">Necesites garantizar l\'accesu a los avisos</string>
  <string name="send_ping">Unviar ping</string>
-  <string name="open_mpris_controls">Control multimedia</string>
+  <string name="open_mpris_controls">Controles multimedia</string>
+  <string name="open_mousepad">Entrada remota</string>
+  <string name="mousepad_info">Muevi un deu enriba la pantalla pa mover el mur. calca pa un clic y usa dos/tres deos pa los motones de drecha y mediu. Usa un primíu llargu pa arrastrar y soltar.</string>
  <string-array name="mousepad_tap_entries">
-    <item>Right click</item>
-    <item>Middle click</item>
-    <item>Nothing</item>
+    <item>Clic drechu</item>
+    <item>Clic d\'en mediu</item>
+    <item>Nada</item>
  </string-array>
-  <string-array name="mousepad_sensitivity_entries">
-    <item>Slowest</item>
-    <item>Above Slowest</item>
-    <item>Default</item>
-    <item>Above Default</item>
-    <item>Fastest</item>
-  </string-array>
-  <string name="error_timed_out">Escosó\'l tiempu</string>
+  <string name="category_connected_devices">Preseos coneutaos</string>
+  <string name="category_not_paired_devices">Preseos disponibles</string>
+  <string name="category_remembered_devices">Preseos recordaos</string>
+  <string name="device_not_reachable">El preséu empareyáu nun ye agamable</string>
+  <string name="unknown_device">Preséu desconocíu</string>
+  <string name="error_not_reachable">Nun ye algamable\'l preséu</string>
+  <string name="error_already_requested">Empareyamientu yá solicitáu</string>
+  <string name="error_already_paired">El preséu yá ta empareyáu</string>
+  <string name="error_could_not_send_package">Nun pudo unviase\'l paquete</string>
+  <string name="error_timed_out">Tiempu escosao</string>
+  <string name="error_canceled_by_user">Encaboxáu pol usuariu</string>
+  <string name="error_canceled_by_other_peer">Encaboxáu pola otra parte</string>
+  <string name="error_invalid_key">Recibióse una clave non válida</string>
+  <string name="pair_requested">Solicitóse l\'empareyamientu</string>
+  <string name="pairing_request_from">Solicitú d\'empareyamientu de %1s</string>
+  <string name="received_url_title">Recibióse l\'enllaz de %1s</string>
+  <string name="received_url_text">Calca p\'abrir «%1s»</string>
+  <string name="incoming_file_title">Ficheru entrante de %1s</string>
+  <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Unviando ficheru a %1s</string>
+  <string name="outgoing_file_text">%1s</string>
+  <string name="received_file_title">Recibióse\'l ficheru de %1s</string>
+  <string name="received_file_fail_title">Fallu al recibir el ficheru de %1s</string>
+  <string name="received_file_text">Tap to open \'%1s\'</string>
+  <string name="sent_file_title">Unvióse\'l ficheru a %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Fallu al unviar el ficheru %1s</string>
+  <string name="sent_file_failed_text">%1s</string>
+  <string name="tap_to_answer">Calca pa responder</string>
+  <string name="reconnect">Reconeutar</string>
+  <string name="show_keyboard">Amosar tecláu</string>
+  <string name="device_not_paired">Preséu non empareyáu</string>
+  <string name="request_pairing">Solicitar empareyamientu</string>
+  <string name="pairing_accept">Aceutar</string>
+  <string name="pairing_reject">Refugar</string>
+  <string name="device">Preséu</string>
+  <string name="pair_device">Empareyar preséu</string>
+  <string name="remote_control">Control remotu</string>
+  <string name="settings">Axustes KDE Connect</string>
+  <string name="mpris_play">Reproducir</string>
+  <string name="mpris_previous">Anterior</string>
+  <string name="mpris_rew">Rebobinar</string>
+  <string name="mpris_ff">Avance rápidu</string>
+  <string name="mpris_next">Siguiente</string>
+  <string name="mpris_volume">Volume</string>
+  <string name="mpris_settings">Axustes multimedia</string>
+  <string name="mpris_time_settings_title">Botones d\'avanzar/rebobinar</string>
+  <string name="mpris_time_settings_summary">Axusta\'l tiempu p\'avanzar/rebobinar al primise</string>
  <string-array name="mpris_time_entries">
-    <item>10 seconds</item>
-    <item>20 seconds</item>
-    <item>30 seconds</item>
-    <item>1 minute</item>
-    <item>2 minutes</item>
+    <item>10 segundos</item>
+    <item>20 segundos</item>
+    <item>30 segundos</item>
+    <item>1 minutu</item>
+    <item>2 minutos</item>
  </string-array>
-  <string name="no_file_browser">Nun hai restoladores de ficheros instalaos</string>
+  <string name="protocol_version_older">Esti preséu usa una versión vieya del protocolu</string>
+  <string name="protocol_version_newer">Esti preséu usa una versión anovada del protocolu</string>
+  <string name="general_settings">Axustes xenerales</string>
+  <string name="plugin_settings">Axustes</string>
+  <string name="plugin_settings_with_name">Axustes de %s</string>
+  <string name="device_name">Nome de preséu</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">Nome de preséu non válidu</string>
+  <string name="shareplugin_text_saved">Recibióse\'l testu y guardóse nel cartafueyu</string>
+  <string name="custom_devices_settings">Llista de preseos personalizada</string>
+  <string name="pair_device_action">Empareyar con un preséu nuevu</string>
+  <string name="unpair_device_action">Desempareyar %s</string>
+  <string name="custom_device_list">Amestar preseos pola IP</string>
+  <string name="share_notification_preference">Avisos sonoros</string>
+  <string name="share_notification_preference_summary">Fai vibrar y reproduz un soníu al recibir un ficheru</string>
+  <string name="title_activity_notification_filter">Peñera d\'avisos</string>
+  <string name="filter_apps_info">Los avisos sincronizaránse coles aplicaciones esbillaes.</string>
+  <string name="sftp_internal_storage">Almacenamientu internu</string>
+  <string name="sftp_all_files">Tolos ficheros</string>
+  <string name="sftp_sdcard_num">Tarxeta SD %d</string>
+  <string name="sftp_sdcard">Tarxeta SD</string>
+  <string name="sftp_readonly">(namai llectura)</string>
+  <string name="sftp_camera">Semeyes de cámara</string>
+  <string name="add_host">Amestar agospiu/IP</string>
+  <string name="add_host_hint">Nome d\'agospiu o IP</string>
+  <string name="no_players_connected">Nun s\'alcontraron reproductores</string>
+  <string name="custom_dev_list_help">Usa esta opción namái si\'l to preséu nun se deteuta automáticamente. Introduz la direición o\'l nome d\'agospiu y toca\'l botón p\'amestalu a la llista. Toca un elementu esistente pa desanicialu de la llista.</string>
+  <string name="mpris_player_on_device">%1$s en %2$s</string>
+  <string name="send_files">Unviar ficheros</string>
+  <string name="pairing_title">Preseos KDE Connect</string>
+  <string name="pairing_description">Deberíen apaecer equí otros preseos executando KDE Connect.</string>
+  <string name="device_paired">Preséu empareyáu</string>
+  <string name="device_rename_title">Renomar preséu</string>
+  <string name="device_rename_confirm">Renomar</string>
+  <string name="refresh">Refrescar</string>
+  <string name="unreachable_description">Esti preséu empareyáu nun ye algamable. Asegúrate que ta coneutáu a la to mesma rede.</string>
+  <string name="no_file_browser">Nun hai restoladores de ficheros instalaos.</string>
+  <string name="pref_plugin_telepathy">Unviar SMS</string>
  <string name="pref_plugin_telepathy_desc">Unvia mensaxes de testu dende\'l to escritoriu</string>
-  <string name="plugin_not_supported">Esti complementu nun lu sofita\'l preséu</string>
-  <string name="findmyphone_description">Fai sonar el teléfonu pa qu\'asina pueas alcontralu</string>
+  <string name="plugin_not_supported">Esti complementu nun ta sofitáu pol preséu</string>
+  <string name="findmyphone_title">Alcuéntra\'l mio teléfonu</string>
+  <string name="findmyphone_description">Fai sonar esti teléfonu pa que pueas alcontralu.</string>
+  <string name="findmyphone_found">Alcontrar</string>
 </resources>
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -5,8 +5,10 @@
  <string name="pref_plugin_battery">Доклад за батерията</string>
  <string name="pref_plugin_battery_desc">Периодично съобщаване за състоянието на батерията</string>
  <string name="pref_plugin_sftp">Достъп до файловата система</string>
+  <string name="pref_plugin_sftp_desc">Позволява отдалечен достъп до файловата система на телефона</string>
  <string name="pref_plugin_clipboard">Синхронизиране на буфера</string>
  <string name="pref_plugin_clipboard_desc">Споделяне съдържанието на буфера</string>
+  <string name="pref_plugin_mpris_desc">Управление на звук/видео от телефона</string>
  <string name="pref_plugin_ping">Пинг</string>
  <string name="pref_plugin_ping_desc">Изпращане и получаване на пинг</string>
  <string name="pref_plugin_notifications">Синхронизиране на уведомленията</string>
@@ -23,13 +25,6 @@
    <item>Middle click</item>
    <item>Nothing</item>
  </string-array>
-  <string-array name="mousepad_sensitivity_entries">
-    <item>Slowest</item>
-    <item>Above Slowest</item>
-    <item>Default</item>
-    <item>Above Default</item>
-    <item>Fastest</item>
-  </string-array>
  <string name="category_connected_devices">Свързани устройства</string>
  <string name="category_remembered_devices">Запомнени устройства</string>
  <string name="plugins_failed_to_load">Неуспешно зареждане на приставки (докоснете за подробности)</string>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Albert Vaca	3804ede5fc	Bumped version number to release	2016-01-17 11:03:16 -08:00
Albert Vaca	92006f744f	Android doesn't support languages with an @, hack to fix build	2016-01-17 10:40:03 -08:00
Albert Astals Cid	2a7107aecf	Disable colored output Messes up scripty output that ends up in a file	2016-01-17 10:39:41 -08:00
l10n daemon script	a3cc399424	SVN_SILENT made messages (after extraction)	2016-01-17 11:58:50 +00:00
l10n daemon script	4dd8a5d86c	SVN_SILENT made messages (after extraction)	2016-01-16 11:50:30 +00:00