summaryrefslogtreecommitdiffhomepage
path: root/app/src/main/res
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2018-01-08 20:42:58 -0600
committerSamuel Holland <samuel@sholland.org>2018-01-08 23:39:26 -0600
commit0b937340513122241d9e5471da5c5090287d5fc0 (patch)
treefb26bd712c81c6730d92e61ccec574c002ed4ab1 /app/src/main/res
parent0ebb4bb2cc503f67454f0c8bcd9dccf4f74aa1a9 (diff)
global: Fix or suppress most lints/warnings
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/drawable/ic_action_add.xml9
-rw-r--r--app/src/main/res/layout/main_activity.xml4
2 files changed, 3 insertions, 10 deletions
diff --git a/app/src/main/res/drawable/ic_action_add.xml b/app/src/main/res/drawable/ic_action_add.xml
deleted file mode 100644
index d4e66388..00000000
--- a/app/src/main/res/drawable/ic_action_add.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportHeight="24"
- android:viewportWidth="24">
- <path
- android:fillColor="#FFFFFF"
- android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
-</vector>
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index d67e64bc..0f21e2e8 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/master_fragment"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ tools:ignore="MergeRootFrame" />