Bumped version for release

Plus removed some unnecessary calls in other places.

AndroidManifest.xml

@@ -1,32 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.kde.kdeconnect_tp"
-    android:versionCode="808"
-    android:versionName="0.8h">
+    android:versionCode="906"
+    android:versionName="0.9.1">
 
     <uses-sdk android:minSdkVersion="9"
               android:targetSdkVersion="22" />
 
     <supports-screens
-        android:smallScreens="true"
-        android:normalScreens="true"
-        android:largeScreens="true"
-        android:xlargeScreens="true"
         android:anyDensity="true"
-    />
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true"
+        android:xlargeScreens="true" />
 
-    <uses-feature android:name="android.hardware.telephony" android:required="false" />
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="false" />
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.INTERNET" />
     <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.READ_PHONE_STATE"
+        android:required="false" />
     <uses-permission android:name="android.permission.BATTERY_STATS" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS" android:required="false" />
+    <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.WRITE_EXTERNAL_STORAGE" />
 
     <application
         android:allowBackup="true"
@@ -36,80 +41,61 @@
         >
 
         <service
-            android:enabled="true"
-            android:name="org.kde.kdeconnect.BackgroundService">
+            android:name="org.kde.kdeconnect.BackgroundService"
+            android:enabled="true" >
         </service>
 
         <activity
-            android:name="org.kde.kdeconnect.UserInterface.MainActivity"
-            android:label="KDE Connect" >
-
+            android:name="org.kde.kdeconnect.UserInterface.MaterialActivity"
+            android:label="KDE Connect"
+            android:theme="@style/KdeConnectTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity
-            android:name="org.kde.kdeconnect.UserInterface.MainSettingsActivity"
-            android:label="@string/settings"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
-            >
-            <meta-data android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-        </activity>
-
-        <activity
-                android:name="org.kde.kdeconnect.UserInterface.DeviceActivity"
-                android:label="@string/device"
-                android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
-                >
-            <meta-data android:name="android.support.PARENT_ACTIVITY"
-                       android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-        </activity>
-
-        <activity
-            android:name="org.kde.kdeconnect.UserInterface.PairActivity"
-            android:label="@string/pair_device"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
-            >
-            <meta-data android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-        </activity>
-
         <activity
             android:name="org.kde.kdeconnect.UserInterface.SettingsActivity"
             android:label="@string/device_menu_plugins"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceActivity"
-            >
-            <meta-data android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.DeviceActivity" />
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                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.DeviceActivity"
-                >
-            <meta-data android:name="android.support.PARENT_ACTIVITY"
-                       android:value="org.kde.kdeconnect.UserInterface.DeviceActivity" />
+            android:name="org.kde.kdeconnect.UserInterface.CustomDevicesActivity"
+            android:label="@string/custom_devices_settings"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                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.MaterialActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                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"
-            >
-            <meta-data android:name="android.support.PARENT_ACTIVITY"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.SettingsActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.kde.kdeconnect.UserInterface.SettingsActivity" />
         </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" />
-                <data android:scheme="package" android:path="org.kde.kdeconnect" />
+
+                <data
+                    android:host="kdeconnect"
+                    android:path="/"
+                    android:scheme="package" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -120,7 +106,8 @@
             <intent-filter>
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
             </intent-filter>
-            <!--<intent-filter>
+            <!--
+            <intent-filter>
                 <action android:name="android.provider.Telephony.SMS_RECEIVED" />
             </intent-filter>
             <intent-filter>
@@ -128,7 +115,8 @@
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.BATTERY_CHANGED" />
-            </intent-filter>-->
+            </intent-filter>
+            -->
         </receiver>
 
         <!-- Plugin-related activities and services -->
@@ -136,42 +124,45 @@
         <activity
             android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisActivity"
             android:label="@string/remote_control"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceActivity"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity"
             >
-        <meta-data android:name="android.support.PARENT_ACTIVITY"
-                   android:value="org.kde.kdeconnect.UserInterface.DeviceActivity" />
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
         </activity>
-
         <activity
             android:name="org.kde.kdeconnect.Plugins.MousePadPlugin.MousePadActivity"
-            android:label="@string/remote_control"
-            android:windowSoftInputMode="stateHidden|adjustResize"
             android:configChanges="orientation|keyboardHidden|screenSize"
+            android:label="@string/remote_control"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity"
             android:screenOrientation="fullSensor"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceActivity"
-            >
-            <meta-data android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.DeviceActivity" />
+            android:windowSoftInputMode="stateHidden|adjustResize" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
         </activity>
-
         <activity
             android:name="org.kde.kdeconnect.Plugins.SharePlugin.ShareActivity"
             android:label="KDE Connect"
             >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="*/*" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND_MULTIPLE" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="*/*" />
             </intent-filter>
         </activity>
-
-        <service android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationReceiver"
-             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
+        <service
+            android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationReceiver"
+            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" >
             <intent-filter>
                 <action android:name="android.service.notification.NotificationListenerService" />
             </intent-filter>

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }
 
@@ -49,13 +49,14 @@ dependencies {
     repositories {
         mavenCentral()
     }
-    compile 'com.android.support:support-v4:22.2.0'
-    compile 'com.android.support:appcompat-v7:22.2.0'
+    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'
+
     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'
 
-
     androidTestCompile 'org.mockito:mockito-core:1.10.19'
 
     // Because mockito has some problems with dex environment

icon.svg

@@ -14,8 +14,11 @@
    height="274.43201"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="kdeconnect.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="icon.svg"
+   inkscape:export-filename="/home/vaka/kdeconnect/kdeconnect-android/res/drawable-mdpi/icon.png"
+   inkscape:export-xdpi="15.741604"
+   inkscape:export-ydpi="15.741604">
   <defs
      id="defs4">
     <linearGradient
@@ -65,18 +68,6 @@
          offset="1"
          id="stop4280" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4153">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4155" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop4157" />
-    </linearGradient>
     <linearGradient
        id="linearGradient3994">
       <stop
@@ -516,43 +507,6 @@
        y2="967.36218"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-296.98485,-295.9747)" />
-    <filter
-       inkscape:collect="always"
-       id="filter3898"
-       x="-0.0093191492"
-       width="1.0186383"
-       y="-0.14599991"
-       height="1.2919998">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.91250003"
-         id="feGaussianBlur3900" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter3902">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.91250003"
-         id="feGaussianBlur3904" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter3935">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.5499999"
-         id="feGaussianBlur3937" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3994"
-       id="linearGradient4000"
-       x1="-61.213001"
-       y1="-85.49823"
-       x2="238.787"
-       y2="424.50177"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3994-1"
@@ -613,52 +567,6 @@
          offset="1"
          id="stop3998-2" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4153"
-       id="linearGradient4159"
-       x1="130"
-       y1="1052.3622"
-       x2="130"
-       y2="1032.3622"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       inkscape:collect="always"
-       id="filter4182"
-       x="-0.0093191487"
-       width="1.0186383"
-       y="-0.146"
-       height="1.292">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.91249998"
-         id="feGaussianBlur4184" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter4186">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.91249998"
-         id="feGaussianBlur4188" />
-    </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter3935-5">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.5499999"
-         id="feGaussianBlur3937-7" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter4253">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.54999983"
-         id="feGaussianBlur4255" />
-    </filter>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient4276"
@@ -680,7 +588,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(415.17269,-239.40615)" />
     <linearGradient
-       gradientTransform="matrix(1.5765306,0,0,1.5765306,-240.12657,-563.0272)"
+       gradientTransform="matrix(1.838244,0,0,1.760204,-248.41104,-733.67334)"
        inkscape:collect="always"
        xlink:href="#linearGradient4303-8"
        id="linearGradient4309-4"
@@ -701,25 +609,6 @@
          offset="1"
          id="stop4307-0" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4022"
-       id="linearGradient4028"
-       x1="338.78699"
-       y1="-145.49823"
-       x2="388.78699"
-       y2="-25.498228"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5765306,0,0,1.5765306,-382.12995,246.43833)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4022"
-       id="linearGradient4052"
-       x1="141.07115"
-       y1="130.60065"
-       x2="243.84538"
-       y2="130.60065"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient4123"
@@ -839,34 +728,26 @@
          offset="1"
          id="stop3998-0" />
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter4199">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.555"
-         id="feGaussianBlur4201" />
-    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#000000"
+     pagecolor="#ffffff"
      bordercolor="#9d4f2f"
      borderopacity="1"
-     inkscape:pageopacity="0.51372549"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="237.10108"
-     inkscape:cy="152.16765"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="-397.02564"
+     inkscape:cy="247.25211"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
      inkscape:window-x="0"
-     inkscape:window-y="-3"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      fit-margin-top="0"
      fit-margin-left="0"
@@ -877,7 +758,7 @@
        id="grid2985"
        empspacing="5"
        visible="true"
-       enabled="true"
+       enabled="false"
        snapvisiblegridlinesonly="true"
        originx="8.7869998px"
        originy="9.9302358px" />
@@ -885,10 +766,6 @@
        orientation="1,0"
        position="8.7869998,239.93024"
        id="guide2989" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="201.787,265.93024"
-       id="guide2991" />
     <sodipodi:guide
        orientation="1,0"
        position="263.787,-0.0697642"
@@ -899,11 +776,7 @@
        id="guide2995" />
     <sodipodi:guide
        orientation="1,0"
-       position="118.787,309.93024"
-       id="guide4512" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="158.787,289.93024"
+       position="263.787,296.98485"
        id="guide4514" />
     <sodipodi:guide
        orientation="0,1"
@@ -911,20 +784,8 @@
        id="guide3939" />
     <sodipodi:guide
        orientation="0,1"
-       position="148.787,89.930236"
+       position="-434.64286,137.14286"
        id="guide3941" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="223.787,174.93024"
-       id="guide3942" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="203.787,179.93024"
-       id="guide3944" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="63.787,39.930236"
-       id="guide4111" />
     <sodipodi:guide
        orientation="1,0"
        position="128.787,19.930236"
@@ -938,7 +799,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Malcer</dc:title>
@@ -952,83 +813,31 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(8.7869998,-787.86042)">
-    <rect
-       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter4199)"
-       id="rect3908-2"
-       width="255"
-       height="256"
-       x="-7.9314225e-07"
-       y="796.36218"
-       rx="10"
-       ry="9.0819159"
-       transform="matrix(1.0053352,0,0,1.0053352,0.03271549,-4.2160417)" />
-    <rect
-       style="opacity:0.2;fill:#b3b3b3;fill-opacity:1;stroke:none"
-       id="rect3908-8"
-       width="259"
-       height="260"
-       x="-2"
-       y="794.36218"
-       rx="12"
-       ry="11.000009" />
-    <rect
-       style="fill:url(#linearGradient4000);fill-opacity:1;stroke:none"
-       id="rect3908"
-       width="255"
-       height="256"
-       x="8.7869997"
-       y="8.5017672"
-       transform="translate(-8.7869998,787.86042)"
-       rx="10"
-       ry="9.0819159" />
-    <rect
-       style="opacity:0.2;fill:url(#linearGradient4159);fill-opacity:1;stroke:none"
-       id="rect3908-1"
-       width="255"
-       height="229.99998"
-       x="0"
-       y="822.36218"
-       rx="10"
-       ry="9.0819159" />
-    <path
-       style="opacity:0.1;fill:#000000;fill-opacity:1;stroke:none"
-       d="m 33.787,244.50177 115,-219.999999 115,139.999999 0,90 0,0 0,0 c 0,0 0,-10 0,0 0,10 -10.11244,10 -10.11244,10 l -204.88756,0 z"
-       id="path4311"
-       inkscape:connector-curvature="0"
-       transform="translate(-8.7869998,787.86042)"
-       sodipodi:nodetypes="cccccczccc" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none;opacity:0.2"
-       d="m 18.787,8.5017668 c 10,0 227,8.4e-6 235,4.2e-6 8,-4.2e-6 10,7 10,9 0,2 0,2 0,2 -1,-4 -5,-6 -8,-6 -82.05383,0 -156.925223,0 -239,0 -4,0 -7.014667,3.536667 -8.0000003,6 0,0 10e-8,-1 10e-8,-2 0,-1 0,-9.0000042 10.0000002,-9.0000042 z"
-       id="rect4116"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="zzzcccczz"
-       transform="translate(-8.7869998,787.86042)" />
     <path
        style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-       d="m 27.883669,812.27851 110.357121,0 c 4.36699,0 7.88265,3.51567 7.88265,7.88266 l 0,39.41326 -9.45918,0 0,-36.2602 -107.204076,0 0,192.33677 107.204076,0 0,-156.07657 9.45918,0 0,165.53567 c 0,4.367 -3.51566,7.8827 -7.88265,7.8827 l -110.357121,0 c -4.367006,0 -7.882669,-3.5157 -7.882669,-7.8827 l 0,-204.94893 c 0,-4.36699 3.515663,-7.88266 7.882669,-7.88266 z"
+       d="m 64.090487,801.86214 128.677053,0 c 5.09194,0 9.19121,3.92526 9.19121,8.80103 l 0,44.00509 -11.02945,0 0,-40.48469 -125.000587,0 0,214.74493 125.000587,0 0,-174.26024 11.02945,0 0,184.82144 c 0,4.8757 -4.09927,8.801 -9.19121,8.801 l -128.677053,0 c -5.091955,0 -9.191239,-3.9253 -9.191239,-8.801 l 0,-228.82653 c 0,-4.87577 4.099284,-8.80103 9.191239,-8.80103 z"
        id="rect3099-1"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sssccccccccssssss" />
     <rect
        style="fill:#2d2d2d;fill-opacity:1;stroke:none"
        id="rect3907-1"
-       width="107.20409"
-       height="192.33675"
-       x="29.460182"
-       y="823.31403"
+       width="125.0006"
+       height="214.7449"
+       x="65.928711"
+       y="814.18335"
        rx="0"
        ry="0" />
     <rect
        style="fill:#1a1a1a;fill-opacity:1;stroke:none"
        id="rect3946-5"
-       width="31.530609"
-       height="1.5765324"
-       x="67.296921"
-       y="817.00793"
-       ry="0.78826618" />
+       width="35.204079"
+       height="1.760206"
+       x="110.82697"
+       y="807.14258"
+       ry="0.88010299" />
     <g
-       transform="matrix(0.80336174,0,0,0.80336174,28.27591,877.43019)"
+       transform="matrix(0.99703783,0,0,0.99703783,60.422321,868.29896)"
        id="g3764-6-1"
        style="fill:#f2f2f2;fill-opacity:1">
       <g
@@ -1048,20 +857,9 @@
     </g>
     <path
        style="opacity:0.5;fill:url(#linearGradient4309-4);fill-opacity:1;stroke:none"
-       d="m 29.460184,823.31423 77.249996,0 13.39023,-0.95204 -76.27562,194.86531 -15.941137,0 z"
+       d="m 65.928713,814.18357 90.073947,0 15.61309,-1.06296 -88.937821,217.56809 -18.58746,0 z"
        id="rect3907-9-4"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccc" />
-    <g
-       transform="translate(-8.7869998,787.86042)"
-       style="font-size:144px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:url(#linearGradient4052);font-family:Nokia Pure Text;-inkscape-font-specification:Nokia Pure Text;stroke-width:7;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="text3247">
-      <path
-         d="m 175.48241,130.60064 c 0,-12.66854 -7.72782,-25.08374 -19.63624,-29.77109 -1.01349,-0.50675 -2.15367,-0.63344 -3.16714,-0.63344 -4.43399,0 -8.10788,3.54721 -8.10788,8.10788 0,9.62809 14.69552,6.96771 14.69552,22.29665 0,15.32892 -14.69552,12.66856 -14.69552,22.29665 0,4.56067 3.67389,8.10786 8.10788,8.10786 1.01347,0 2.15365,-0.12675 3.16714,-0.63341 11.90842,-4.81405 19.63624,-17.10257 19.63624,-29.7711 m 32.43149,0 c 0,-25.71712 -15.45564,-49.660734 -39.2725,-59.668882 -1.01349,-0.380054 -2.15365,-0.633418 -3.29383,-0.633418 -4.43399,0 -8.10787,3.673884 -8.10787,8.107876 0,3.547179 2.02697,5.95421 4.94073,7.474443 3.42051,1.773596 6.58766,3.293813 9.62811,5.574155 12.54186,9.121356 19.88962,23.690216 19.88962,39.145826 0,15.45561 -7.34776,30.02448 -19.88962,39.14582 -3.04045,2.28033 -6.2076,3.80056 -9.62811,5.57416 -2.91376,1.52023 -4.94073,3.92726 -4.94073,7.47444 0,4.43399 3.67388,8.10788 8.23456,8.10788 1.01349,0 2.15365,-0.25337 3.16714,-0.63344 23.81686,-10.00813 39.2725,-33.95173 39.2725,-59.66886 m 32.43149,0 c 0,-38.892415 -23.18348,-74.111022 -58.90875,-89.439944 -1.01349,-0.380071 -2.15365,-0.633435 -3.29383,-0.633435 -4.43398,0 -8.10786,3.673884 -8.10786,8.107877 0,3.673868 1.90028,5.700845 4.94072,7.474442 1.77359,1.013473 3.80057,1.646891 5.70086,2.66038 3.54718,1.900271 7.09439,4.053938 10.3882,6.460953 20.7764,15.328939 33.06492,39.525917 33.06492,65.369727 0,25.84382 -12.28852,50.04079 -33.06492,65.36973 -3.29381,2.40701 -6.84102,4.56066 -10.3882,6.46095 -1.90029,1.01349 -3.92727,1.64691 -5.70086,2.66039 -3.04044,1.7736 -4.94072,3.80058 -4.94072,7.47445 0,4.43399 3.67388,8.10787 8.10786,8.10787 1.14018,0 2.28034,-0.25338 3.29383,-0.63343 35.72527,-15.32892 58.90875,-50.54755 58.90875,-89.43996"
-         id="path3252"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssssccccssccsccssccccsscccscccsscc"
-         style="fill:url(#linearGradient4028);fill-opacity:1;stroke:url(#linearGradient4052);stroke-opacity:1;stroke-width:7;stroke-miterlimit:4;stroke-dasharray:none" />
-    </g>
   </g>
 </svg>

proguard-rules.pro

@@ -26,3 +26,5 @@
 -dontwarn org.bouncycastle.**
 -dontwarn org.slf4j.**
 
+-keepattributes SourceFile,LineNumberTable
+

res/color/state_list_drawer_text.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#FFFFFF" android:state_checked="true" />
+    <item android:color="#000000" android:state_checked="false" />
+</selector>
+

res/drawable/button_round.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/accent" />
+    <corners android:bottomRightRadius="2dip"
+        android:bottomLeftRadius="2dip"
+        android:topRightRadius="2dip"
+        android:topLeftRadius="2dip"/>
+</shape>

res/drawable/drawer_header_noscale.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/drawer_header"
+    android:gravity="center|clip_vertical|clip_horizontal"
+    />

res/drawable/state_list_drawer_background.xml

@@ -0,0 +1,5 @@
+<?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/background_floating_material_light" android:state_checked="false" />
+</selector>

res/drawable/text_section_header.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <size android:width="1000dp" android:height="2dp" />
+    <solid android:color="#cecbce"/>
+</shape>

res/layout/activity_device.xml

@@ -1,13 +1,90 @@
-<ListView 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"
-    android:id="@+id/buttons_list"
     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"
-    android:fillViewport="true"
-    android:divider="@null"
-    tools:context=".MainActivity"
-    />
+    android:padding="@dimen/activity_vertical_margin"
+    tools:context=".DeviceFragment"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:id="@+id/pairing_buttons"
+        android:layout_gravity="center">
+
+        <ProgressBar
+            android:visibility="gone"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/pair_progress" />
+
+        <TextView
+            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: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:text="@string/request_pairing"
+        />
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            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:text="@string/pairing_accept"
+                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:text="@string/pairing_reject"
+                android:layout_weight="1" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/unpair_message"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        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"
+        />
+
+</LinearLayout>

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>

res/layout/activity_main.xml

@@ -1,14 +1,40 @@
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+<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: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=".MainActivity"
-    android:id="@+id/listView1"
-    android:addStatesFromChildren="true"
-    android:orientation="vertical">
+    android:fitsSystemWindows="true"
+    tools:context="org.kde.kdeconnect.UserInterface.MaterialActivity">  <!-- fitSystemWindows to make the drawer slide below the Lollipop transparent status bar -->
 
-</ListView>
+    <LinearLayout
+        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"
+            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">
+        </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"
+        />
+
+</android.support.v4.widget.DrawerLayout>

res/layout/activity_pair.xml

@@ -1,60 +0,0 @@
-<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: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=".MainActivity"
-    android:orientation="vertical">
-
-
-    <ProgressBar
-        android:visibility="gone"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/pair_progress" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/device_not_paired"
-        android:id="@+id/pair_message"
-        android:layout_gravity="left|center_vertical"
-    />
-
-    <Button
-        android:id="@+id/pair_button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/request_pairing"
-    />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:id="@+id/pair_request"
-        android:layout_gravity="center">
-
-        <Button
-            android:id="@+id/accept_button"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/pairing_accept"
-            android:layout_weight="1"
-        />
-
-        <Button
-            android:id="@+id/reject_button"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/pairing_reject"
-            android:layout_weight="1" />
-
-    </LinearLayout>
-
-
-</LinearLayout>

res/layout/custom_ip_list.xml

@@ -30,7 +30,6 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:text="@string/add_host"
-            android:onClick="addNewIp"
             android:id="@android:id/button1"/>
 
 

res/layout/list_item_category.xml

@@ -5,9 +5,20 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
-	<include
-		android:id="@+id/list_item_category_text"
-		layout="@android:layout/preference_category" />
+    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        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:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:id="@+id/list_item_category_text"
+        />
 
     <TextView
         android:layout_width="wrap_content"

res/layout/list_item_entry.xml

@@ -5,9 +5,11 @@
     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:background="@drawable/abc_list_selector_holo_dark"
     android:orientation="vertical">
     <!-- We should use android:background="@android:/listChoiceBackgroundIndicator"

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>
+
+

res/layout/list_item_with_icon_entry.xml

@@ -0,0 +1,53 @@
+<?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:clickable="true"
+    android:background="@drawable/abc_list_selector_holo_dark"
+    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"
+        />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:orientation="vertical"
+        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:layout_marginLeft="8dip"
+            android:layout_marginStart="8dip"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:singleLine="true"
+            android:textColor="#CC2222"
+            android:visibility="gone"
+            android:text="" />
+
+    </LinearLayout>
+
+</LinearLayout>

res/layout/mpris_control.xml

@@ -145,6 +145,7 @@
             android:layout_height="30dip"
             android:maxWidth="30dip"
             android:layout_marginRight="10dip"
+            android:layout_marginEnd="10dip"
             android:id="@+id/imageView"
             android:layout_weight="0"
             android:layout_gravity="left|center_vertical"

res/layout/nav_header.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="160dp"
+    android:padding="16dp"
+    android:background="@drawable/drawer_header"
+    android:orientation="vertical"
+    android:gravity="bottom">
+
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="KDE Connect"
+        android:textColor="#FFF"
+        android:textStyle="bold"
+        android:paddingBottom="4dp"
+        android:layout_above="@+id/device_name"
+        />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="My device"
+        android:id="@+id/device_name"
+        android:layout_marginBottom="8dp"
+        android:textColor="#fff"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        />
+
+    <!--
+    <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>

res/layout/preference_with_button.xml

@@ -0,0 +1,83 @@
+<?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.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- 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:res="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:background="?attr/selectableItemBackground" >
+
+    <!-- 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_marginStart="15dip"
+        android:layout_marginLeft="15dip"
+        android:layout_marginEnd="15dip"
+        android:layout_marginRight="4dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView android:id="@+android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:maxLines="3" />
+
+    </RelativeLayout>
+
+    <ImageButton
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/settingsButton"
+        android:padding="8dip"
+        android:background="@drawable/abc_btn_borderless_material"
+        android:src="@drawable/ic_action_settings_inverted"/>
+
+</LinearLayout>

res/menu/pairing.xml

@@ -2,11 +2,11 @@
     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"
-            kdeconnect:showAsAction="ifRoom"
-            android:title="@string/reconnect"
+        android:id="@+id/menu_refresh"
+        android:icon="@drawable/ic_action_refresh"
+        android:orderInCategory="200"
+        kdeconnect:showAsAction="never"
+        android:title="@string/refresh"
         />
 
     <item
@@ -18,16 +18,14 @@
         />
 
     <item
-        android:id="@+id/menu_settings"
-        android:icon="@drawable/ic_action_settings"
+        android:id="@+id/menu_rename"
         android:orderInCategory="300"
-        android:title="@string/settings"
+        android:title="@string/device_rename_title"
         kdeconnect:showAsAction="never"
         />
 
        <item
         android:id="@+id/menu_custom_device_list"
-        android:icon="@drawable/ic_action_settings"
         android:orderInCategory="900"
         android:title="@string/custom_device_list"
         kdeconnect:showAsAction="never"

res/menu/refresh.xml

@@ -0,0 +1,20 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    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"
+            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>

res/values-ca/strings.xml

@@ -108,6 +108,8 @@
   <string name="invalid_device_name">El nom del dispositiu no és vàlid</string>
   <string name="shareplugin_text_saved">S\'ha rebut text i s\'ha desat al porta-retalls</string>
   <string name="custom_devices_settings">Llista personalitzada de dispositius</string>
+  <string name="pair_device_action">Aparella amb un dispositiu nou</string>
+  <string name="unpair_device_action">Desparella %s</string>
   <string name="custom_device_list">Afegeix dispositius per la IP</string>
   <string name="share_notification_preference">Rebombori de les notificacions</string>
   <string name="share_notification_preference_summary">Vibra i reprodueix un so en rebre un fitxer</string>
@@ -124,4 +126,16 @@
   <string name="no_players_connected">No s\'ha trobat cap reproductor</string>
   <string name="custom_dev_list_help">Empreu aquesta opció només si el dispositiu no és detectat automàticament. Introduïu a sota l\'adreça IP o nom de la màquina i premeu el botó per afegir-lo a la llista. Seleccioneu un element existent per eliminar-lo de la llista.</string>
   <string name="mpris_player_on_device">%1$s sobre el %2$s</string>
+  <string name="send_files">Envia els fitxers</string>
+  <string name="pairing_title">Dispositius del KDE Connect</string>
+  <string name="pairing_description">Els altres dispositius que executin el KDE Connect a la mateixa xarxa han d\'aparèixer aquí.</string>
+  <string name="device_paired">Dispositiu aparellat</string>
+  <string name="device_rename_title">Reanomena el dispositiu</string>
+  <string name="device_rename_confirm">Reanomena</string>
+  <string name="refresh">Refresca</string>
+  <string name="unreachable_description">Aquest dispositiu aparellat no és accessible. Assegureu-vos que està connectat a la mateixa xarxa.</string>
+  <string name="no_file_browser">No hi ha instal·lat cap explorador de fitxers.</string>
+  <string name="pref_plugin_telepathy">Envia un SMS</string>
+  <string name="pref_plugin_telepathy_desc">Envia missatges de text des de l\'escriptori</string>
+  <string name="plugin_not_supported">Aquest connector no és admès pel dispositiu</string>
 </resources>

res/values-cs/strings.xml

@@ -47,7 +47,7 @@
   <string name="unknown_device">Neznámé zařízení</string>
   <string name="error_not_reachable">Zařízení je nedostupné</string>
   <string name="error_already_requested">Párování již bylo vyžádáno</string>
-  <string name="error_already_paired">Zařízení je již spárované</string>
+  <string name="error_already_paired">Zařízení je již spárováno</string>
   <string name="error_could_not_send_package">Balíček nelze poslat</string>
   <string name="error_timed_out">Čas vypršel</string>
   <string name="error_canceled_by_user">Přerušeno uživatelem</string>
@@ -73,7 +73,7 @@
   <string name="right_click">Poslat kliknutí pravým tlačítkem</string>
   <string name="middle_click">Poslat kliknutí prostředním tlačítkem</string>
   <string name="show_keyboard">Zobrazit klávesnici</string>
-  <string name="device_not_paired">Zařízení není spárované</string>
+  <string name="device_not_paired">Zařízení není spárováno</string>
   <string name="request_pairing">Vyžádat párování</string>
   <string name="pairing_accept">Přijmout</string>
   <string name="pairing_reject">Odmítnout</string>
@@ -108,6 +108,8 @@
   <string name="invalid_device_name">Neplatný název zařízení</string>
   <string name="shareplugin_text_saved">Přijatý text byl uložen do schránky</string>
   <string name="custom_devices_settings">Seznam vlastních zařízení</string>
+  <string name="pair_device_action">Spárovat nové zařízení</string>
+  <string name="unpair_device_action">Zrušit párování %s</string>
   <string name="custom_device_list">Přidat zařízení podle IP</string>
   <string name="share_notification_preference">Hlasitá upozornění</string>
   <string name="share_notification_preference_summary">Vibrovat a přehrát melodii při přijímání souboru</string>
@@ -124,4 +126,16 @@
   <string name="no_players_connected">Přehrávač nenalezen</string>
   <string name="custom_dev_list_help">Použijte tuto možnost pouze pokud není vaše zařízení automaticky detekováno. Zadejte níže IP adresu a název hostitele a stiskněte tlačítko pro přidání do seznamu. Stiskněte existující položku pro odstranění ze seznamu.</string>
   <string name="mpris_player_on_device">%1$s na %2$s</string>
+  <string name="send_files">Odeslat soubory</string>
+  <string name="pairing_title">Zařízení KDE Connect</string>
+  <string name="pairing_description">Zde by se měla zobrazit další zařízení, na kterých běží KDE Connect ve stejné síti.</string>
+  <string name="device_paired">Zařízení je spárováno</string>
+  <string name="device_rename_title">Přejmenovat zařízení</string>
+  <string name="device_rename_confirm">Přejmenovat</string>
+  <string name="refresh">Obnovit</string>
+  <string name="unreachable_description">Toto spárované zařízení je nedosažitelné. Ujistěte se, že běží ve stejné síti.</string>
+  <string name="no_file_browser">Není nainstalován žádný prohlížeč souborů.</string>
+  <string name="pref_plugin_telepathy">Poslat SMS</string>
+  <string name="pref_plugin_telepathy_desc">Posílejte zprávy ze své pracovní plochy</string>
+  <string name="plugin_not_supported">Tento modul zařízení nepodporuje</string>
 </resources>

res/values-de/strings.xml

@@ -9,11 +9,14 @@
   <string name="pref_plugin_clipboard">Abgleich der Zwischenablage</string>
   <string name="pref_plugin_clipboard_desc">Inhalt der Zwischenablage freigeben</string>
   <string name="pref_plugin_mousepad_desc">Verwendet Ihr Handy als Maus und Tastatur</string>
+  <string name="pref_plugin_mpris">Multimedia-Bedienung</string>
   <string name="pref_plugin_mpris_desc">Audio und Video mit Ihrem Telefon steuern</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Senden und Empfangen von Pings</string>
   <string name="pref_plugin_notifications">Benachrichtigungs-Abgleich</string>
   <string name="pref_plugin_notifications_desc">Zugriff auf Ihre Benachrichtigungen von anderen Geräten</string>
+  <string name="pref_plugin_sharereceiver">Veröffentlichen und Empfangen</string>
+  <string name="pref_plugin_sharereceiver_desc">Dateien und Adressen (URLs) zwischen Geräten teilen</string>
   <string name="plugin_not_available">Diese Funktion ist in Ihrer Android-Version nicht verfügbar</string>
   <string name="device_list_empty">Keine Geräte</string>
   <string name="ok">OK</string>
@@ -21,6 +24,7 @@
   <string name="open_settings">Einstellungen öffnen</string>
   <string name="no_permissions">Sie müssen die Erlaubnis zum Zugriff auf Benachrichtigungen erteilen</string>
   <string name="send_ping">Ping senden</string>
+  <string name="open_mpris_controls">Multimedia-Bedienung</string>
   <string-array name="mousepad_tap_entries">
     <item>Rechtsklick</item>
     <item>Mittelklick</item>
@@ -52,6 +56,7 @@
   <string name="outgoing_file_title">Datei wird an %1s gesendet</string>
   <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Datei von %1s erhalten</string>
+  <string name="received_file_fail_title">Der Empfang der Datei %1s ist fehlgeschlagen</string>
   <string name="sent_file_title">Datei an %1s gesendet</string>
   <string name="sent_file_text">%1s</string>
   <string name="sent_file_failed_title">Das Senden der Datei an %1s ist fehlgeschlagen</string>
@@ -68,7 +73,7 @@
   <string name="device">Gerät</string>
   <string name="pair_device">Gerät verbinden</string>
   <string name="remote_control">Fernbedienung</string>
-  <string name="settings">KDE-Verbindungseinstellungen</string>
+  <string name="settings">KDE-Connect-Einstellungen</string>
   <string name="mpris_play">Wiedergabe</string>
   <string name="mpris_previous">Zurück</string>
   <string name="mpris_rew">Schneller Rücklauf</string>
@@ -97,6 +102,7 @@
   <string name="custom_device_list">Geräte nach IP hinzufügen</string>
   <string name="share_notification_preference_summary">Beim Empfang einer Datei vibrieren und einen Sound abspielen</string>
   <string name="title_activity_notification_filter">Benachrichtigungs-Filter</string>
+  <string name="filter_apps_info">Benachrichtigungen werden zwischen den ausgewählten Anwendungen abgeglichen.</string>
   <string name="sftp_internal_storage">Interner Speicher</string>
   <string name="sftp_all_files">Alle Dateien</string>
   <string name="sftp_sdcard_num">SD-Karte %d</string>
@@ -105,5 +111,6 @@
   <string name="sftp_camera">Kamerabilder</string>
   <string name="add_host">Rechner/IP hinzufügen</string>
   <string name="add_host_hint">Rechnername oder IP</string>
+  <string name="no_players_connected">Keine Medienspieler gefunden</string>
   <string name="mpris_player_on_device">%1$s auf %2$s</string>
 </resources>

res/values-es/strings.xml

@@ -10,11 +10,14 @@
   <string name="pref_plugin_clipboard_desc">Compartir el contenido del portapapeles</string>
   <string name="pref_plugin_mousepad">Entrada remota</string>
   <string name="pref_plugin_mousepad_desc">Usar su teléfono como ratón y teclado</string>
+  <string name="pref_plugin_mpris">Controles multimedia</string>
   <string name="pref_plugin_mpris_desc">Controlar audio y vídeo desde el teléfono</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Enviar y recibir pings</string>
   <string name="pref_plugin_notifications">Sincronizar notificaciones</string>
   <string name="pref_plugin_notifications_desc">Acceder a las notificaciones desde otros dispositivos</string>
+  <string name="pref_plugin_sharereceiver">Compartir y recibir</string>
+  <string name="pref_plugin_sharereceiver_desc">Compartir archivos y URL entre dispositivos</string>
   <string name="plugin_not_available">Esta funcionalidad no está disponible en su versión de Android</string>
   <string name="device_list_empty">Ningún dispositivo</string>
   <string name="ok">Aceptar</string>
@@ -22,6 +25,8 @@
   <string name="open_settings">Abrir preferencias</string>
   <string name="no_permissions">Debe otorgar permiso para acceder a las notificaciones</string>
   <string name="send_ping">Enviar ping</string>
+  <string name="open_mpris_controls">Control multimedia</string>
+  <string name="open_mousepad">Entrada remota</string>
   <string name="mousepad_info">Mueva un dedo sobre la pantalla para mover el cursor del ratón. Pulse para ejecutar un clic y use dos/tres dedos para emular los botones derecho y central. Use una pulsación larga para arrastrar y soltar.</string>
   <string name="mousepad_double_tap_settings_title">Establecer la acción al pulsar con dos dedos</string>
   <string name="mousepad_triple_tap_settings_title">Establecer la acción al pulsar con tres dedos</string>
@@ -103,6 +108,8 @@
   <string name="invalid_device_name">Nombre de dispositivo no válido</string>
   <string name="shareplugin_text_saved">Texto recibido y guardado en el portapapeles</string>
   <string name="custom_devices_settings">Lista de dispositivos personalizada</string>
+  <string name="pair_device_action">Vincular un nuevo dispositivo</string>
+  <string name="unpair_device_action">Desvincular %s</string>
   <string name="custom_device_list">Añadir dispositivos por IP</string>
   <string name="share_notification_preference">Notificaciones ruidosas</string>
   <string name="share_notification_preference_summary">Vibrar y reproducir un sonido cuando se reciba un archivo</string>
@@ -119,4 +126,16 @@
   <string name="no_players_connected">Ningún reproductor encontrado</string>
   <string name="custom_dev_list_help">Use esta opción solo si su dispositivo no es detectado automáticamente. Introduzca la dirección IP o nombre debajo y pulse el botón para añadirlo a la lista. Pulse un ítem existente para eliminarlo de la lista.</string>
   <string name="mpris_player_on_device">%1$s en %2$s</string>
+  <string name="send_files">Enviar archivos</string>
+  <string name="pairing_title">Dispositivos de KDE Connect</string>
+  <string name="pairing_description">Otros dispositivos ejecutando KDE Connect en su misma red deberían aparecer aquí.</string>
+  <string name="device_paired">Dispositivo vinculado</string>
+  <string name="device_rename_title">Renombrar dispositivo</string>
+  <string name="device_rename_confirm">Renombrar</string>
+  <string name="refresh">Actualizar</string>
+  <string name="unreachable_description">Este dispositivo vinculado no está disponible. Asegúrese que está conectado a su misma red.</string>
+  <string name="no_file_browser">No hay navegadores de archivos instalados.</string>
+  <string name="pref_plugin_telepathy">Enviar SMS</string>
+  <string name="pref_plugin_telepathy_desc">Enviar mensajes de texto desde el escritorio</string>
+  <string name="plugin_not_supported">Este complemento no está permitido por el dispositivo</string>
 </resources>

res/values-fi/strings.xml

@@ -10,11 +10,14 @@
   <string name="pref_plugin_clipboard_desc">Jaa leikepöydän sisältö</string>
   <string name="pref_plugin_mousepad">Kauko-ohjaus</string>
   <string name="pref_plugin_mousepad_desc">Käytä puhelintasi hiirenä ja näppäimistönä</string>
+  <string name="pref_plugin_mpris">Multimedian ohjaus</string>
   <string name="pref_plugin_mpris_desc">Ohjaa ääntä ja videota puhelimestasi</string>
   <string name="pref_plugin_ping">Tiedustelupaketti</string>
   <string name="pref_plugin_ping_desc">Lähetä ja vastaanota tiedustelupaketteja</string>
   <string name="pref_plugin_notifications">Ilmoitusten synkronointi</string>
   <string name="pref_plugin_notifications_desc">Näe ilmoituksesi muissa laitteissa</string>
+  <string name="pref_plugin_sharereceiver">Jako ja vastaanottaminen</string>
+  <string name="pref_plugin_sharereceiver_desc">Jaa tiedostoja ja osoitteita laitteiden välillä</string>
   <string name="plugin_not_available">Piirre ei ole käytettävissä Android-versiossasi</string>
   <string name="device_list_empty">Ei laitteita</string>
   <string name="ok">OK</string>
@@ -22,6 +25,8 @@
   <string name="open_settings">Avaa asetukset</string>
   <string name="no_permissions">Sinun on annettava lupa ilmoitusten näkemiseen</string>
   <string name="send_ping">Lähetä tiedustelupaketti</string>
+  <string name="open_mpris_controls">Multimedian ohjaus</string>
+  <string name="open_mousepad">Kauko-ohjaus</string>
   <string name="mousepad_info">Liikuta hiiren osoitinta liikuttamalla sormeasi näytöllä. Napsauta napauttamalla yhdellä sormella, käytä oikeaa painiketta kahdella sormella ja keskipainiketta kolmella. Vedä ja pudota painamalla pitkään.</string>
   <string name="mousepad_double_tap_settings_title">Aseta kahden sormen napautuksen toiminto</string>
   <string name="mousepad_triple_tap_settings_title">Aseta kolmen sormen napautuksen toiminto</string>
@@ -103,6 +108,8 @@
   <string name="invalid_device_name">Virheellinen laitenimi</string>
   <string name="shareplugin_text_saved">Vastaanotettiin tekstiä, tallennettiin leikepöydälle</string>
   <string name="custom_devices_settings">Omien laitteiden luettelo</string>
+  <string name="pair_device_action">Kytke uusi laite pariksi</string>
+  <string name="unpair_device_action">Poista laitepari %s</string>
   <string name="custom_device_list">Lisää laitteita IP:llä</string>
   <string name="share_notification_preference">Äänekkäät ilmoitukset</string>
   <string name="share_notification_preference_summary">Värise ja soita ääni tiedoston saapuessa</string>
@@ -119,4 +126,16 @@
   <string name="no_players_connected">Soittimia ei löytynyt</string>
   <string name="custom_dev_list_help">Käytä tätä vain, jos laitettasi ei tunnisteta automaattisesti. Kirjoita IP-osoite tai konenimi alle ja kosketa painiketta lisätäksesi sen luetteloon. Kosketa olemassa olevaa kohtaa poistaaksesi sen luettelosta.</string>
   <string name="mpris_player_on_device">%1$s laitteella %2$s</string>
+  <string name="send_files">Lähetä tiedostoja</string>
+  <string name="pairing_title">KDE Connect -laitteet</string>
+  <string name="pairing_description">Muiden samassa verkossa olevien KDE Connectia käyttävien laitteiden pitäisi ilmestyä tähän.</string>
+  <string name="device_paired">Laite kytketty pariksi</string>
+  <string name="device_rename_title">Laitteen nimen muuttaminen</string>
+  <string name="device_rename_confirm">Muuta nimi</string>
+  <string name="refresh">Päivitä</string>
+  <string name="unreachable_description">Tämä pariksi kytketty laite ei ole tavoitttavissa. Tarkista, että se on yhteydessä samaan verkkoon.</string>
+  <string name="no_file_browser">Tiedostoselaimia ei asennettu.</string>
+  <string name="pref_plugin_telepathy">Lähetä tekstiviesti</string>
+  <string name="pref_plugin_telepathy_desc">Lähetä tekstiviestejä työpöydältäsi</string>
+  <string name="plugin_not_supported">Laite ei tue tätä liitännäistä</string>
 </resources>

res/values-gl/strings.xml

@@ -1,13 +1,35 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
+  <string name="pref_plugin_telephony">Notificador de telefonía</string>
+  <string name="pref_plugin_telephony_desc">Envíe notificacións de mensaxes SMS e chamadas.</string>
+  <string name="pref_plugin_battery">Informe da batería</string>
+  <string name="pref_plugin_battery_desc">Envíe periodicamente un informe sobre o estado da batería.</string>
+  <string name="pref_plugin_sftp">Revelador do sistema de ficheiros</string>
+  <string name="pref_plugin_sftp_desc">Permite examinar o sistema de ficheiros do teléfono remotamente.</string>
+  <string name="pref_plugin_clipboard">Sincronización do portapapeis</string>
+  <string name="pref_plugin_clipboard_desc">Comparta o contido do portapapeis.</string>
+  <string name="pref_plugin_mousepad">Entrada remota</string>
+  <string name="pref_plugin_mousepad_desc">Use o teléfono como rato e teclado.</string>
+  <string name="pref_plugin_mpris">Controis multimedia</string>
+  <string name="pref_plugin_mpris_desc">Controle o son e o vídeo desde o teléfono.</string>
   <string name="pref_plugin_ping">Ping</string>
-  <string name="pref_plugin_ping_desc">Enviar e recibir pings.</string>
+  <string name="pref_plugin_ping_desc">Envíe e reciba pings.</string>
   <string name="pref_plugin_notifications">Sincronización de notificacións</string>
+  <string name="pref_plugin_notifications_desc">Acceda ás súas notificacións desde outros dispositivos.</string>
+  <string name="pref_plugin_sharereceiver">Compartir e recibir</string>
+  <string name="pref_plugin_sharereceiver_desc">Comparta ficheiros e enderezos URL entre dispositivos.</string>
+  <string name="plugin_not_available">Esta funcionalidade non está dispoñíbel para a súa versión de Android.</string>
   <string name="device_list_empty">Non hai dispositivos.</string>
   <string name="ok">Aceptar</string>
   <string name="cancel">Cancelar</string>
   <string name="open_settings">Abrir a configuración</string>
+  <string name="no_permissions">Debe conceder permisos para acceder ás notificacións.</string>
   <string name="send_ping">Enviar un ping</string>
+  <string name="open_mpris_controls">Control multimedia</string>
+  <string name="open_mousepad">Entrada remota</string>
+  <string name="mousepad_info">Mova un dedo na pantalla para mover o cursor. Toque para facer clic, e use dous ou tres dedos para os botóns secundario e central. Prema durante un tempo para arrastrar e soltar.</string>
+  <string name="mousepad_double_tap_settings_title">Definir a acción de tocar con dous dedos</string>
+  <string name="mousepad_triple_tap_settings_title">Definir a acción de tocar con tres dedos</string>
   <string-array name="mousepad_tap_entries">
     <item>Clic dereito</item>
     <item>Clic central</item>
@@ -17,22 +39,46 @@
   <string name="mousepad_triple_default">medio</string>
   <string name="category_connected_devices">Dispositivos conectados</string>
   <string name="category_not_paired_devices">Dispositivos dispoñíbeis</string>
+  <string name="category_remembered_devices">Dispositivos coñecidos</string>
+  <string name="plugins_failed_to_load">Non foi posíbel cargar os seguintes complementos (toque para obter máis información):</string>
   <string name="device_menu_plugins">Configuración do engadido</string>
   <string name="device_menu_unpair">Desemparellarse</string>
+  <string name="device_not_reachable">O dispositivo emparellado está fóra do alcance.</string>
   <string name="unknown_device">Dispositivo descoñecido</string>
   <string name="error_not_reachable">Dispositivo fóra do alcance</string>
+  <string name="error_already_requested">Xa solicitou emparellarse.</string>
+  <string name="error_already_paired">O dispositivo xa está emparellado.</string>
+  <string name="error_could_not_send_package">Non foi posíbel enviar o paquete.</string>
   <string name="error_timed_out">Esgotouse o tempo límite</string>
   <string name="error_canceled_by_user">Cancelouno o usuario.</string>
   <string name="error_canceled_by_other_peer">Cancelouse remotamente</string>
+  <string name="error_invalid_key">Recibiuse unha clave incorrecta.</string>
+  <string name="pair_requested">Solicitude de emparellamento</string>
+  <string name="pairing_request_from">Solicitude de emparellamento de %1s.</string>
+  <string name="received_url_title">Recibiuse unha ligazón de %1s</string>
+  <string name="received_url_text">Toque para abrir «%1s».</string>
+  <string name="incoming_file_title">Ficheiro entrande de %1s</string>
   <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Enviando un ficheiro a %1s</string>
   <string name="outgoing_file_text">%1s</string>
+  <string name="received_file_title">Recibiuse un ficheiro de %1s</string>
+  <string name="received_file_fail_title">Non foi posíbel recibir o ficheiro de %1s</string>
+  <string name="received_file_text">Toque para abrir «%1s».</string>
+  <string name="sent_file_title">Enviouse o ficheiro a %1s</string>
   <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Non foi posíbel enviar o ficheiro %1s</string>
   <string name="sent_file_failed_text">%1s</string>
+  <string name="tap_to_answer">Toque para contestar</string>
   <string name="reconnect">Conectar de novo</string>
+  <string name="right_click">Enviar un clic secundario</string>
+  <string name="middle_click">Enviar un clic central</string>
   <string name="show_keyboard">Mostrar o teclado</string>
+  <string name="device_not_paired">O dispositivo non está emparellado</string>
+  <string name="request_pairing">Solicitar emparellarse</string>
   <string name="pairing_accept">Aceptar</string>
   <string name="pairing_reject">Rexeitar</string>
   <string name="device">Dispositivo</string>
+  <string name="pair_device">Emparellar o dispositivo</string>
   <string name="remote_control">Control remoto</string>
   <string name="settings">Configuración de KDE Connect</string>
   <string name="mpris_play">Reproducir</string>
@@ -41,6 +87,9 @@
   <string name="mpris_ff">Cara a adiante</string>
   <string name="mpris_next">Seguinte</string>
   <string name="mpris_volume">Volume</string>
+  <string name="mpris_settings">Configuración de son e vídeo</string>
+  <string name="mpris_time_settings_title">Botóns de avanzar e retroceder</string>
+  <string name="mpris_time_settings_summary">Axuste o tempo que avanzar ou retroceder ao premer.</string>
   <string-array name="mpris_time_entries">
     <item>10 segundos</item>
     <item>20 segundos</item>
@@ -48,12 +97,31 @@
     <item>1 minuto</item>
     <item>2 minutos</item>
   </string-array>
+  <string name="share_to">Compartir con…</string>
+  <string name="protocol_version_older">Este dispositivo usa unha versión vella do protocolo.</string>
+  <string name="protocol_version_newer">Este dispositivo usa unha versión máis nova do protocolo.</string>
   <string name="general_settings">Configuración xeral</string>
   <string name="plugin_settings">Configuración</string>
+  <string name="plugin_settings_with_name">Configuración de %s</string>
   <string name="device_name">Nome do dispositivo</string>
   <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">Nome de dispositivo incorrecto</string>
+  <string name="shareplugin_text_saved">Recibiuse un texto e gardouse no portapapeis</string>
+  <string name="custom_devices_settings">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list">Engadir dispositivos por IP</string>
+  <string name="share_notification_preference">Notificacións sonoras</string>
+  <string name="share_notification_preference_summary">Vibrar e reproducir un son ao recibir un ficheiro.</string>
+  <string name="title_activity_notification_filter">Filtro de notificacións</string>
+  <string name="filter_apps_info">As notificacións sincronizaranse para os seguintes programas.</string>
   <string name="sftp_internal_storage">Almacenamento interno</string>
   <string name="sftp_all_files">Todos os ficheiros</string>
+  <string name="sftp_sdcard_num">Tarxeta SD %d</string>
+  <string name="sftp_sdcard">Tarxeta SD</string>
   <string name="sftp_readonly">(só lectura)</string>
   <string name="sftp_camera">Imaxes da cámara</string>
+  <string name="add_host">Engadir unha nome ou IP</string>
+  <string name="add_host_hint">Nome ou IP do servidor.</string>
+  <string name="no_players_connected">Non se atoparon reprodutores.</string>
+  <string name="custom_dev_list_help">Marque esta opción unicamente se o seu dispositivo non se detecta automaticamente. Escriba o enderezo IP ou o nome de servidor do dispositivo e toque o botón para engadilo á lista. Toque un elemento existente para retiralo da lista.</string>
+  <string name="mpris_player_on_device">%1$s en %2$s</string>
 </resources>

res/values-it/strings.xml

@@ -10,11 +10,14 @@
   <string name="pref_plugin_clipboard_desc">Condividi il contenuto degli appunti</string>
   <string name="pref_plugin_mousepad">Impulso remoto</string>
   <string name="pref_plugin_mousepad_desc">Usa il tuo telefono come mouse e tastiera</string>
+  <string name="pref_plugin_mpris">Controlli multimediali</string>
   <string name="pref_plugin_mpris_desc">Controlla la riproduzione audio/video dal telefono</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Invia e ricevi ping</string>
   <string name="pref_plugin_notifications">Sincronizzazione notifiche</string>
   <string name="pref_plugin_notifications_desc">Consenti l\'accesso alle notifiche dagli altri dispositivi</string>
+  <string name="pref_plugin_sharereceiver">Condividi e ricevi</string>
+  <string name="pref_plugin_sharereceiver_desc">Condividi file e URL tra i dispositivi</string>
   <string name="plugin_not_available">Questa funzionalità non è disponibile sulla tua versione di Android</string>
   <string name="device_list_empty">Nessun dispositivo</string>
   <string name="ok">OK</string>
@@ -22,6 +25,8 @@
   <string name="open_settings">Apri impostazioni</string>
   <string name="no_permissions">Devi concedere i permessi per l\'accesso alle notifiche</string>
   <string name="send_ping">Invia ping</string>
+  <string name="open_mpris_controls">Controllo multimediale</string>
+  <string name="open_mousepad">Impulso remoto</string>
   <string name="mousepad_info">Muovi un dito sullo schermo per spostare il puntatore del mouse. Tocca per un clic e usa due/tre dita per i pulsanti destro e centrale. Utilizza una pressione lunga per trascinare e rilasciare.</string>
   <string name="mousepad_double_tap_settings_title">Imposta azione per il tocco a due dita</string>
   <string name="mousepad_triple_tap_settings_title">Imposta azione per il tocco a tre dita</string>

res/values-nl/strings.xml

@@ -108,6 +108,8 @@
   <string name="invalid_device_name">Ongeldige apparaatnaam</string>
   <string name="shareplugin_text_saved">Oontvangen tekst, opgeslagen op klembord</string>
   <string name="custom_devices_settings">Aangepaste lijst apparaten</string>
+  <string name="pair_device_action">Een paar maken met een nieuw apparaat</string>
+  <string name="unpair_device_action">Paar %s uit elkaar halen</string>
   <string name="custom_device_list">Voeg apparaten toe per IP-adres</string>
   <string name="share_notification_preference">Luidruchtige meldingen</string>
   <string name="share_notification_preference_summary">Vibreer en speel een geluidje bij ontvangen van een bestand</string>
@@ -124,4 +126,16 @@
   <string name="no_players_connected">Geen spelers gevonden</string>
   <string name="custom_dev_list_help">Deze optie alleen gebruiken als uw apparaat niet automatisch gedetecteerd wordt. Voer IP-adres of hostnaam hieronder in en klik op de knop om het aan de lijst toe te voegen. Klik op een bestaand item om het uit de lijst te verwijderen.</string>
   <string name="mpris_player_on_device">%1$s op %2$s</string>
+  <string name="send_files">Bestanden verzenden</string>
+  <string name="pairing_title">Apparaten van KDE Connect</string>
+  <string name="pairing_description">Andere apparaten met KDE Connect in uw zelfde netwerk zouden hier moeten verschijnen.</string>
+  <string name="device_paired">Gepaard apparaat</string>
+  <string name="device_rename_title">Apparaat hernoemen</string>
+  <string name="device_rename_confirm">Hernoemen</string>
+  <string name="refresh">Verversen</string>
+  <string name="unreachable_description">Dit gepaarde apparaat is niet bereikbaar. Ga na dat het is verbonden met uw zelfde netwerk.</string>
+  <string name="no_file_browser">Er zijn geen bestandsbrowsers geïnstalleerd.</string>
+  <string name="pref_plugin_telepathy">SMS verzenden</string>
+  <string name="pref_plugin_telepathy_desc">Stuur tekstberichten van uw bureaublad</string>
+  <string name="plugin_not_supported">Deze plug-in wordt niet ondersteund door het apparaat</string>
 </resources>

res/values-pl/strings.xml

@@ -108,6 +108,8 @@
   <string name="invalid_device_name">Nieprawidłowa nazwa urządzenia</string>
   <string name="shareplugin_text_saved">Otrzymano tekst, zapisano do schowka</string>
   <string name="custom_devices_settings">Lista własnych urządzeń</string>
+  <string name="pair_device_action">Sparuj nowe urządzenie</string>
+  <string name="unpair_device_action">Rozparuj %s</string>
   <string name="custom_device_list">Dodaj urządzenia po numerze IP</string>
   <string name="share_notification_preference">Hałaśliwe powiadomienia</string>
   <string name="share_notification_preference_summary">Zadrżyj i odegraj dźwięk przy odebraniu pliku</string>
@@ -124,4 +126,16 @@
   <string name="no_players_connected">Nie znaleziono żadnego odtwarzacza</string>
   <string name="custom_dev_list_help">Użyj tej opcji tylko wtedy, gdy twoje urządzenie nie jest samoczynnie wykrywane. Podaj adres IP i nazwę gospodarza poniżej i dotknij przycisku, aby dodać je do listy. Dotknij istniejącego elementu, aby usunąć go z listy.</string>
   <string name="mpris_player_on_device">%1$s na %2$s</string>
+  <string name="send_files">Wyślij pliki</string>
+  <string name="pairing_title">Urządzenia KDE Connect</string>
+  <string name="pairing_description">Tutaj powinny pojawić się inne urządzenia uruchmione z KDE Connect w twojej sieci.</string>
+  <string name="device_paired">Urządzenie sparowane</string>
+  <string name="device_rename_title">Zmień nazwę urządzenia</string>
+  <string name="device_rename_confirm">Zmień nazwę</string>
+  <string name="refresh">Odśwież</string>
+  <string name="unreachable_description">To sparowane urządzenie jest nieosiągalne. Upewnij się, że jest podłączone do tej samej sieci.</string>
+  <string name="no_file_browser">Nie wgrano żadanych przeglądarek plików.</string>
+  <string name="pref_plugin_telepathy">Wyślij SMS-a</string>
+  <string name="pref_plugin_telepathy_desc">Wyślij wiadomość tekstową z komputera</string>
+  <string name="plugin_not_supported">Ta wtyczka nie jest obsługiwana przez to urządzenie</string>
 </resources>

res/values-pt-rBR/strings.xml

@@ -108,6 +108,8 @@
   <string name="invalid_device_name">Nome do dispositivo inválido</string>
   <string name="shareplugin_text_saved">Texto recebido e salvo na área de transferência</string>
   <string name="custom_devices_settings">Lista de dispositivos personalizada</string>
+  <string name="pair_device_action">Emparelhar um novo dispositivo</string>
+  <string name="unpair_device_action">Desemparelhar o %s</string>
   <string name="custom_device_list">Adicionar dispositivos pelo IP</string>
   <string name="share_notification_preference">Notificações barulhentas</string>
   <string name="share_notification_preference_summary">Vibrar e tocar um som ao receber um arquivo</string>
@@ -124,4 +126,16 @@
   <string name="no_players_connected">Nenhum reprodutor encontrado</string>
   <string name="custom_dev_list_help">Use esta opção apenas se o seu dispositivo não for detectado automaticamente. Digite o endereço IP ou nome da máquina no campo abaixo e toque o botão para adicioná-lo à lista. Toque em um item existente para removê-lo da lista.</string>
   <string name="mpris_player_on_device">%1$s em %2$s</string>
+  <string name="send_files">Enviar arquivos</string>
+  <string name="pairing_title">Dispositivos do KDE Connect</string>
+  <string name="pairing_description">Os outros dispositivos executando o KDE Connect na mesma rede devem aparecer aqui.</string>
+  <string name="device_paired">Dispositivo emparelhado</string>
+  <string name="device_rename_title">Renomear dispositivo</string>
+  <string name="device_rename_confirm">Renomear</string>
+  <string name="refresh">Atualizar</string>
+  <string name="unreachable_description">Este dispositivo emparelhado não está acessível. Certifique-se de que está conectado à mesma rede que você.</string>
+  <string name="no_file_browser">Não há gerenciadores de arquivos instalados.</string>
+  <string name="pref_plugin_telepathy">Enviar SMS</string>
+  <string name="pref_plugin_telepathy_desc">Enviar mensagens de texto do seu Desktop</string>
+  <string name="plugin_not_supported">Este plugin não é suportado pelo dispositivo</string>
 </resources>

res/values-pt/strings.xml

@@ -108,6 +108,8 @@
   <string name="invalid_device_name">Nome do dispositivo inválido</string>
   <string name="shareplugin_text_saved">Texto recebido e guardado na área de transferência</string>
   <string name="custom_devices_settings">Lista de dispositivos personalizada</string>
+  <string name="pair_device_action">Emparelhar um novo dispositivo</string>
+  <string name="unpair_device_action">Desemparelhar o %s</string>
   <string name="custom_device_list">Adicionar dispositivos pelo IP</string>
   <string name="share_notification_preference">Notificações com ruído</string>
   <string name="share_notification_preference_summary">Vibrar e tocar um som ao receber um ficheiro</string>
@@ -124,4 +126,16 @@
   <string name="no_players_connected">Não foram encontrados leitores</string>
   <string name="custom_dev_list_help">Use esta opção apenas se o seu dispositivo não for detectado automaticamente. Indique o endereço IP ou nome da máquina em baixo e carregue no botão para a adicionar à lista. Carregue sobre um item existente para o remover da lista.</string>
   <string name="mpris_player_on_device">%1$s em %2$s</string>
+  <string name="send_files">Enviar os ficheiros</string>
+  <string name="pairing_title">Dispositivos do KDE Connect</string>
+  <string name="pairing_description">Os outros dispositivos a executar o KDE Connect na mesma rede que você deverão aparecer aqui.</string>
+  <string name="device_paired">Dispositivo emparelhado</string>
+  <string name="device_rename_title">Mudar o nome do dispositivo</string>
+  <string name="device_rename_confirm">Mudar o Nome</string>
+  <string name="refresh">Actualizar</string>
+  <string name="unreachable_description">Este dispositivo emparelhado não está acessível. Certifique-se que está ligado à mesma rede que você.</string>
+  <string name="no_file_browser">Não existem gestores de ficheiros instalados.</string>
+  <string name="pref_plugin_telepathy">Enviar um SMS</string>
+  <string name="pref_plugin_telepathy_desc">Enviar mensagens de texto a partir do seu ambiente de trabalho</string>
+  <string name="plugin_not_supported">Este \'plugin\' não é suportado pelo dispositivo</string>
 </resources>

res/values-sk/strings.xml

@@ -10,11 +10,14 @@
   <string name="pref_plugin_clipboard_desc">Zdieľať obsah schránky</string>
   <string name="pref_plugin_mousepad">Vzdialený vstup</string>
   <string name="pref_plugin_mousepad_desc">Použiť váš telefón ako myš a klávesnicu</string>
+  <string name="pref_plugin_mpris">Multimediálne ovládače</string>
   <string name="pref_plugin_mpris_desc">Ovládať audio/video z vášho telefónu</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Poslať a prijať pingy</string>
   <string name="pref_plugin_notifications">Synchronizácia pripomienok</string>
   <string name="pref_plugin_notifications_desc">Prístup k vašim pripomienkam z iných zariadení</string>
+  <string name="pref_plugin_sharereceiver">Zdieľať a prijať</string>
+  <string name="pref_plugin_sharereceiver_desc">Zdieľať súbory a medzi zariadeniami</string>
   <string name="plugin_not_available">Táto funkcia nie je dostupná vo vašej verzii Androidu</string>
   <string name="device_list_empty">Žiadne zariadenia</string>
   <string name="ok">OK</string>
@@ -22,6 +25,8 @@
   <string name="open_settings">Otvoriť nastavenia</string>
   <string name="no_permissions">Musíte povoliť oprávnenia na prístup k pripomienkam</string>
   <string name="send_ping">Poslať ping</string>
+  <string name="open_mpris_controls">Multimediálny ovládač</string>
+  <string name="open_mousepad">Vzdialený vstup</string>
   <string name="mousepad_info">Posúvajte prst na obrazovke na posun kurzora. Ťuknutie vyvolá klik a použite dva/tri prsty pre pravé a stredné tlačidlo. Použite dlhé stlačenie pre drag and drop.</string>
   <string name="mousepad_double_tap_settings_title">Nastaviť akciu dvoch prstov</string>
   <string name="mousepad_triple_tap_settings_title">Nastaviť akciu troch prstov</string>

res/values-sv/strings.xml

@@ -5,7 +5,7 @@
   <string name="pref_plugin_battery">Batterirapport</string>
   <string name="pref_plugin_battery_desc">Rapportera periodiskt batteriets status</string>
   <string name="pref_plugin_sftp">Exponera filsystem</string>
-  <string name="pref_plugin_sftp_desc">Gör det möjligt att bläddra i telefonens filsystem från annan enhet</string>
+  <string name="pref_plugin_sftp_desc">Gör det möjligt att bläddra i telefonens filsystem från annan apparat</string>
   <string name="pref_plugin_clipboard">Synkronisera klippbord</string>
   <string name="pref_plugin_clipboard_desc">Dela klippbordets innehåll</string>
   <string name="pref_plugin_mousepad">Fjärrinmatning</string>
@@ -17,7 +17,7 @@
   <string name="pref_plugin_notifications">Synkronisering av underrättelser</string>
   <string name="pref_plugin_notifications_desc">Kom åt underrättelser från andra apparater</string>
   <string name="pref_plugin_sharereceiver">Dela och ta emot</string>
-  <string name="pref_plugin_sharereceiver_desc">Dela filer och webbadresser mellan enheter</string>
+  <string name="pref_plugin_sharereceiver_desc">Dela filer och webbadresser mellan apparater</string>
   <string name="plugin_not_available">Funktionen är inte tillgänglig i Android-versionen</string>
   <string name="device_list_empty">Inga apparater</string>
   <string name="ok">Ok</string>
@@ -38,12 +38,12 @@
   <string name="mousepad_double_default">höger</string>
   <string name="mousepad_triple_default">mitten</string>
   <string name="category_connected_devices">Anslutna apparater</string>
-  <string name="category_not_paired_devices">Tillgängliga enheter</string>
+  <string name="category_not_paired_devices">Tillgängliga apparater</string>
   <string name="category_remembered_devices">Ihågkomna apparater</string>
   <string name="plugins_failed_to_load">Misslyckades ladda insticksprogram (rör för mer information):</string>
   <string name="device_menu_plugins">Inställningar av insticksprogram</string>
   <string name="device_menu_unpair">Ta bort ihopparning</string>
-  <string name="device_not_reachable">Ihopparad enhet kan inte nås</string>
+  <string name="device_not_reachable">Ihopparad apparat kan inte nås</string>
   <string name="unknown_device">Okänd apparat</string>
   <string name="error_not_reachable">Apparaten kan inte nås</string>
   <string name="error_already_requested">Ihopparning redan begärd</string>
@@ -108,6 +108,8 @@
   <string name="invalid_device_name">Ogiltigt apparatnamn</string>
   <string name="shareplugin_text_saved">Tog emot text, spara på klippbordet</string>
   <string name="custom_devices_settings">Egen apparatlista</string>
+  <string name="pair_device_action">Para ihop med ny apparat</string>
+  <string name="unpair_device_action">Ta bort ihopparning %s</string>
   <string name="custom_device_list">Lägg till apparater enligt IP-adress</string>
   <string name="share_notification_preference">Ljudliga underrättelser</string>
   <string name="share_notification_preference_summary">Vibrera och spela ett ljud när en fil tas emot</string>
@@ -124,4 +126,16 @@
   <string name="no_players_connected">Inga spelare hittades</string>
   <string name="custom_dev_list_help">Använd bara alternativet om apparaten inte detekteras automatiskt. Skriv in IP-adress eller värddatornamn nedan och rör vid knappen för att lägga till den i listan. Rör vid ett befintligt objekt för att ta bort det från listan.</string>
   <string name="mpris_player_on_device">%1$s på %2$s</string>
+  <string name="send_files">Skicka filer</string>
+  <string name="pairing_title">KDE-anslut apparater</string>
+  <string name="pairing_description">Andra apparater som kör KDE-anslut i samma nätverk ska synas här.</string>
+  <string name="device_paired">Apparat ihopparad</string>
+  <string name="device_rename_title">Byt namn på apparat</string>
+  <string name="device_rename_confirm">Byt namn</string>
+  <string name="refresh">Uppdatera</string>
+  <string name="unreachable_description">Den här ihopparade apparaten kan inte nås. Försälkra dig om att den är ansluten till samma nätverk.</string>
+  <string name="no_file_browser">Det finns inga filbläddrare installerade.</string>
+  <string name="pref_plugin_telepathy">Skicka SMS</string>
+  <string name="pref_plugin_telepathy_desc">Skicka textmeddelanden från skrivbordet</string>
+  <string name="plugin_not_supported">Insticksprogrammet stöds inte av apparaten</string>
 </resources>

res/values-uk/strings.xml

@@ -108,6 +108,8 @@
   <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">Додати пристрої за IP</string>
   <string name="share_notification_preference">Звукові сповіщення</string>
   <string name="share_notification_preference_summary">Вібрація і відтворення звуку у відповідь на отримання файла</string>
@@ -124,4 +126,16 @@
   <string name="no_players_connected">Не знайдено програвачів</string>
   <string name="custom_dev_list_help">Цим пунктом слід користуватися, лише якщо ваш пристрій не було визначено у автоматичному режимі. Введіть IP-адресу або назву вузла нижче і натисніть кнопку, щоб додати пункт до списку. Натисніть наявний пункт, щоб вилучити його зі списку.</string>
   <string name="mpris_player_on_device">%1$s на %2$s</string>
+  <string name="send_files">Надіслати файли</string>
+  <string name="pairing_title">Пристрої KDE Connect</string>
+  <string name="pairing_description">Тут має бути показано інші пристрої у вашій мережі, де запущено KDE Connect.</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>
 </resources>

res/values-w820dp/dimens.xml

@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>

res/values/strings.xml

@@ -13,6 +13,8 @@
     <string name="pref_plugin_mousepad_desc">Use your phone as a mouse and keyboard</string>
     <string name="pref_plugin_mpris">Multimedia controls</string>
     <string name="pref_plugin_mpris_desc">Control audio/video from your phone</string>
+    <string name="pref_plugin_runcommand">Run Command</string>
+    <string name="pref_plugin_runcommand_desc">Runs a command on your system</string>
     <string name="pref_plugin_ping">Ping</string>
     <string name="pref_plugin_ping_desc">Send and receive pings</string>
     <string name="pref_plugin_notifications">Notification sync</string>
@@ -125,6 +127,8 @@
     <string name="invalid_device_name">Invalid device name</string>
     <string name="shareplugin_text_saved">Received text, saved to clipboard</string>
     <string name="custom_devices_settings">Custom device list</string>
+    <string name="pair_device_action">Pair a new device</string>
+    <string name="unpair_device_action">Unpair %s</string>
     <string name="custom_device_list">Add devices by IP</string>
     <string name="share_notification_preference">Noisy notifications</string>
     <string name="share_notification_preference_summary">Vibrate and play a sound when receiving a file</string>
@@ -141,5 +145,20 @@
     <string name="no_players_connected">No players found</string>
     <string name="custom_dev_list_help">Use this option only if your device is not automatically detected. Enter IP address or hostname below and touch the button to add it to the list. Touch an existing item to remove it from the list.</string>
     <string name="mpris_player_on_device">%1$s on %2$s</string>
+    <string name="send_files">Send files</string>
 
+    <string name="pairing_title">KDE Connect Devices</string>
+    <string name="pairing_description">Other devices running KDE Connect in your same network should appear here.</string>
+    <string name="device_paired">Device paired</string>
+    <string name="device_rename_title">Rename device</string>
+    <string name="device_rename_confirm">Rename</string>
+    <string name="refresh">Refresh</string>
+    <string name="unreachable_description">This paired device is not reachable. Make sure it is connected to your same network.</string>
+    <string name="no_file_browser">There are no file browsers installed.</string>
+    <string name="pref_plugin_telepathy">Send SMS</string>
+    <string name="pref_plugin_telepathy_desc">Send text messages from your desktop</string>
+    <string name="plugin_not_supported">This plugin is not supported by the device</string>
+    <string name="findmyphone_title">Find My Phone</string>
+    <string name="findmyphone_description">Rings this phone so you can find it.</string>
+    <string name="findmyphone_found">Found</string>
 </resources>

res/values/styles.xml

@@ -1,7 +1,21 @@
 <resources>
+    <color name="primary">#F67400</color>
+    <color name="primaryDark">#BD5900</color>
+    <color name="accent">#4ebffa</color>
 
-    <style name="KdeConnectTheme" parent="Theme.AppCompat">
+    <!-- NoActionBar because we use a Toolbar widget as ActionBar -->
+    <style name="KdeConnectTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- The three colors used by system widgets, according to https://chris.banes.me/2014/10/17/appcompat-v21/ -->
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primaryDark</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="android:textColorPrimary">@android:color/black</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
 
+    <style name="KdeConnectTheme.NoActionBar" parent="KdeConnectTheme">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
     </style>
 
 </resources>

src/org/kde/kdeconnect/Backends/BaseLink.java

@@ -30,14 +30,28 @@ import java.util.ArrayList;
 
 public abstract class BaseLink {
 
+    public enum ConnectionStarted {
+        Locally, Remotely;
+    };
+
+    public interface PackageReceiver {
+        void onPackageReceived(NetworkPackage np);
+    }
+
     private final BaseLinkProvider linkProvider;
     private final String deviceId;
-    private final ArrayList<PackageReceiver> receivers = new ArrayList<PackageReceiver>();
+    private final ArrayList<PackageReceiver> receivers = new ArrayList<>();
     protected PrivateKey privateKey;
 
-    protected BaseLink(String deviceId, BaseLinkProvider linkProvider) {
+    protected ConnectionStarted connectionSource; // If the other device sent me a broadcast,
+                                                  // I should not close the connection with it
+                                                  // because it's probably trying to find me and
+                                                  // potentially ask for pairing.
+
+    protected BaseLink(String deviceId, BaseLinkProvider linkProvider, ConnectionStarted connectionSource) {
         this.linkProvider = linkProvider;
         this.deviceId = deviceId;
+        this.connectionSource = connectionSource;
     }
 
     public String getDeviceId() {
@@ -52,9 +66,8 @@ public abstract class BaseLink {
         return linkProvider;
     }
 
-
-    public interface PackageReceiver {
-        public void onPackageReceived(NetworkPackage np);
+    public ConnectionStarted getConnectionSource() {
+        return connectionSource;
     }
 
     public void addPackageReceiver(PackageReceiver pr) {
@@ -71,8 +84,11 @@ public abstract class BaseLink {
         }
     }
 
+    public void disconnect() {
+        linkProvider.connectionLost(this);
+    }
+
     //TO OVERRIDE, should be sync
     public abstract void sendPackage(NetworkPackage np,Device.SendPackageStatusCallback callback);
     public abstract void sendPackageEncrypted(NetworkPackage np,Device.SendPackageStatusCallback callback, PublicKey key);
-
 }

src/org/kde/kdeconnect/Backends/BaseLinkProvider.java

@@ -20,20 +20,18 @@
 
 package org.kde.kdeconnect.Backends;
 
-import android.util.Log;
-
-import org.kde.kdeconnect.Backends.BaseLink;
 import org.kde.kdeconnect.NetworkPackage;
 
 import java.util.ArrayList;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 public abstract class BaseLinkProvider {
 
-    private final ArrayList<ConnectionReceiver> connectionReceivers = new ArrayList<ConnectionReceiver>();
+    private final CopyOnWriteArrayList<ConnectionReceiver> connectionReceivers = new CopyOnWriteArrayList<>();
 
     public interface ConnectionReceiver {
-        public void onConnectionReceived(NetworkPackage identityPackage, BaseLink link);
-        public void onConnectionLost(BaseLink link);
+        void onConnectionReceived(NetworkPackage identityPackage, BaseLink link);
+        void onConnectionLost(BaseLink link);
     }
 
     public void addConnectionReceiver(ConnectionReceiver cr) {

src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java

@@ -38,15 +38,18 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.nio.channels.NotYetConnectedException;
 import java.security.PublicKey;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.TimeoutException;
 
 public class LanLink extends BaseLink {
 
     private IoSession session = null;
 
+    @Override
     public void disconnect() {
+        closeSocket();
+        super.disconnect();
+    }
+
+    public void closeSocket() {
         if (session == null) {
             Log.e("KDE/LanLink", "Not yet connected");
             return;
@@ -54,8 +57,8 @@ public class LanLink extends BaseLink {
         session.close(true);
     }
 
-    public LanLink(IoSession session, String deviceId, BaseLinkProvider linkProvider) {
-        super(deviceId, linkProvider);
+    public LanLink(IoSession session, String deviceId, BaseLinkProvider linkProvider, ConnectionStarted connectionSource) {
+        super(deviceId, linkProvider, connectionSource);
         this.session = session;
     }
 
@@ -89,7 +92,7 @@ public class LanLink extends BaseLink {
             WriteFuture future = session.write(np.serialize());
             future.awaitUninterruptibly();
             if (!future.isWritten()) {
-                Log.e("KDE/sendPackage", "!future.isWritten()");
+                //Log.e("KDE/sendPackage", "!future.isWritten()");
                 callback.sendFailure(future.getException());
                 return;
             }
@@ -137,6 +140,10 @@ public class LanLink extends BaseLink {
             if (callback != null) {
                 callback.sendFailure(e);
             }
+        } finally  {
+            //Make sure we close the payload stream, if any
+            InputStream stream = np.getPayload();
+            try { stream.close(); } catch (Exception e) { }
         }
     }