mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-31 06:05:12 +00:00
Code Issues Releases Wiki Activity

Merge branch '1.x'

Browse Source
This commit is contained in:
Albert Vaca
2016-09-24 20:34:03 +02:00
parent 6c3811a0af 2e3fabb3e5
commit b454dec0a0
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.kde.kdeconnect_tp"
android:versionCode="1430"
android:versionName="1.4.3">
android:versionCode="1440"
android:versionName="1.4.4">
<uses-sdk android:minSdkVersion="9"
android:targetSdkVersion="22" />

22
res/values-zh-rTW/strings.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string-array name="mousepad_tap_entries">
<item>Right click</item>
<item>Middle click</item>
<item>Nothing</item>
</string-array>
<string-array name="mousepad_sensitivity_entries">
<item>Slowest</item>
<item>Above Slowest</item>
<item>Default</item>
<item>Above Default</item>
<item>Fastest</item>
</string-array>
<string-array name="mpris_time_entries">
<item>10 seconds</item>
<item>20 seconds</item>
<item>30 seconds</item>
<item>1 minute</item>
<item>2 minutes</item>
</string-array>
</resources>

4
src/org/kde/kdeconnect/Plugins/NotificationsPlugin/AppDatabase.java
View File

@@ -86,10 +86,10 @@ public class AppDatabase {
ContentValues cv = new ContentValues();
cv.put(KEY_IS_ENABLED, isEnabled?"true":"false");
if (res.getCount() > 0) {
ourDatabase.update(DATABASE_TABLE, cv, KEY_PACKAGE_NAME + "=?",new String[]{packageName});
} else {
cv.put(KEY_PACKAGE_NAME, packageName);
ourDatabase.insert(DATABASE_TABLE, null, cv);
} else {
ourDatabase.update(DATABASE_TABLE, cv, KEY_PACKAGE_NAME + "=?",new String[]{packageName});
}
res.close();
}