Merge branch 'indev' ; v1.3

vhaudiquet · Sep 17, 2018 · 6c7c77e · 6c7c77e
1 parent d553710
commit 6c7c77e
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 2 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/app.iml b/app/app.iml
@@ -115,6 +115,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />

diff --git a/app/release/blade-1.2.apk b/app/release/blade-1.2.apk
diff --git a/app/src/main/java/v/blade/ui/settings/SettingsActivity.java b/app/src/main/java/v/blade/ui/settings/SettingsActivity.java
@@ -23,7 +23,6 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.provider.DocumentFile;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceFragmentCompat;

diff --git a/app/src/main/res/layout/activity_link_manager.xml b/app/src/main/res/layout/activity_link_manager.xml
@@ -2,7 +2,6 @@
 <LinearLayout
         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:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"