Merge branch 'master' of https://github.com/nextcloud/android into searchViewWrongFiles

build.gradle

@@ -51,10 +51,11 @@ repositories {
 
 android {
     lintOptions {
-        abortOnError true
+        abortOnError false
         lintConfig file("${project.rootDir}/lint.xml")
         htmlReport true
         htmlOutput file("$project.buildDir/reports/lint/lint.html")
+        disable 'MissingTranslation'
     }
 
     dexOptions {
@@ -115,10 +116,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/LICENSE'

scripts/lint/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 698 errors and 860 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 74 errors and 859 warnings</span>

src/main/res/layout/contacts_backup_fragment.xml

@@ -68,7 +68,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/standard_margin"
                 android:layout_weight="1"
-                android:gravity="right"
+                android:gravity="end"
                 android:text="@string/contacts_preference_backup_never"
                 android:textAppearance="?android:attr/textAppearanceMedium"/>
         </LinearLayout>
@@ -78,7 +78,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/standard_margin"
-            android:onClick="backupContacts"
             android:text="@string/contacts_backup_button"
             android:theme="@style/Button.Primary"/>
 
@@ -98,7 +97,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/standard_margin"
-            android:onClick="openDate"
             android:text="@string/contacts_preference_choose_date"
             android:theme="@style/Button.Primary"/>