Merge branch 'master' into develop

This commit is contained in:
Jeremy
2017-11-06 14:44:37 +01:00
6 changed files with 109 additions and 32 deletions

View File

@@ -12,15 +12,16 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<application
<application
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:name="com.keepassdroid.app.App"
android:allowBackup="true"
android:fullBackupContent="@xml/backup"
android:backupAgent="com.keepassdroid.backup.SettingsBackupAgent"
android:theme="@style/KeepassDXStyle">
<meta-data android:name="com.google.android.backup.api_key"
<meta-data android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAIKwReNelmy5SvhZzK3bpK_JisjzUko6cL_8GR4w" />
<activity android:name=".KeePass"
android:label="@string/app_name">