XML cleanup

OpenKeychain/src/main/res/xml/account_desc.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="org.sufficientlysecure.keychain"
     android:icon="@drawable/ic_launcher"
-                       android:label="@string/app_name"/>
+    android:label="@string/app_name" />

OpenKeychain/src/main/res/xml/adv_preferences.xml

@@ -1,20 +1,3 @@
-<!--
-    Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/section_defaults">
         <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference

OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ContactsSource xmlns:android="http://schemas.android.com/apk/res/android">
-    <ContactsDataKind android:mimeType="vnd.android.cursor.item/vnd.org.sufficientlysecure.keychain.key"
+    <ContactsDataKind
-                      android:detailColumn="data1"/>
+        android:mimeType="vnd.android.cursor.item/vnd.org.sufficientlysecure.keychain.key"
+        android:detailColumn="data1" />
 </ContactsSource>

OpenKeychain/src/main/res/xml/gen_preferences.xml

@@ -1,22 +1,5 @@
-<!--
-    Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/section_general" >
+    <PreferenceCategory android:title="@string/section_general">
         <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
             android:entries="@array/passphrase_cache_ttl_entries"
             android:entryValues="@array/passphrase_cache_ttl_values"

OpenKeychain/src/main/res/xml/preference_headers.xml

@@ -1,20 +1,3 @@
-<!--
-    Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
     <header
         android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$GeneralPrefsFragment"

OpenKeychain/src/main/res/xml/preference_headers_legacy.xml

@@ -1,20 +1,3 @@
-<!--
-    Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <Preference
         android:title="@string/section_general" >

OpenKeychain/src/main/res/xml/sync_adapter_desc.xml

@@ -3,4 +3,4 @@
     android:contentAuthority="com.android.contacts"
     android:accountType="org.sufficientlysecure.keychain"
     android:supportsUploading="false"
-              android:userVisible="true"/>
+    android:userVisible="true" />