From f4b10d5ed6378973a625bc8ba47cbdcfa28aca6b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Feb 2021 10:08:53 +0100
Subject: [PATCH] Cleanup

---
 vector/src/main/res/layout/bottom_sheet_verification.xml       | 1 -
 vector/src/main/res/layout/composer_layout.xml                 | 3 +--
 .../main/res/layout/composer_layout_constraint_set_compact.xml | 1 -
 .../res/layout/composer_layout_constraint_set_expanded.xml     | 3 +--
 vector/src/main/res/layout/item_timeline_event_base.xml        | 1 -
 vector/src/main/res/layout/item_timeline_event_base_noinfo.xml | 1 -
 vector/src/main/res/layout/item_timeline_event_base_state.xml  | 1 -
 vector/src/main/res/layout/item_timeline_event_file_stub.xml   | 1 -
 8 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index b3b41303ee..9ed8f17069 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -32,7 +32,6 @@
             android:id="@+id/otherUserShield"
             android:layout_width="16dp"
             android:layout_height="16dp"
-            android:importantForAccessibility="no"
             app:layout_constraintCircle="@+id/otherUserAvatarImageView"
             app:layout_constraintCircleAngle="135"
             app:layout_constraintCircleRadius="16dp"
diff --git a/vector/src/main/res/layout/composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml
index 5633e23e14..0db905d015 100644
--- a/vector/src/main/res/layout/composer_layout.xml
+++ b/vector/src/main/res/layout/composer_layout.xml
@@ -101,8 +101,7 @@
         android:id="@+id/composerShieldImageView"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        tools:ignore="MissingConstraints"
-        tools:src="@drawable/ic_shield_black" />
+        tools:ignore="MissingConstraints" />
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
index 7739fd3e11..13c43f23cf 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
@@ -130,7 +130,6 @@
         app:layout_constraintEnd_toStartOf="@+id/composerEditText"
         app:layout_constraintStart_toEndOf="@+id/attachmentButton"
         app:layout_constraintTop_toTopOf="@id/sendButton"
-        tools:src="@drawable/ic_shield_black"
         tools:visibility="visible" />
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
index 016ec15c89..76ade25e97 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@@ -134,8 +134,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/sendButton"
         app:layout_constraintEnd_toStartOf="@+id/composerEditText"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/sendButton"
-        tools:src="@drawable/ic_shield_black" />
+        app:layout_constraintTop_toTopOf="@+id/sendButton" />
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 7102a28060..cba12f7515 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -73,7 +73,6 @@
         android:layout_alignEnd="@id/decorationSpace"
         android:layout_marginTop="7dp"
         android:visibility="gone"
-        tools:src="@drawable/ic_shield_warning"
         tools:visibility="visible" />
 
     <FrameLayout
diff --git a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
index d5a8356567..6442f230d5 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
@@ -78,7 +78,6 @@
         android:layout_marginTop="8dp"
         android:layout_toStartOf="@id/viewStubContainer"
         android:visibility="gone"
-        tools:src="@drawable/ic_shield_warning"
         tools:visibility="visible" />
 
 
diff --git a/vector/src/main/res/layout/item_timeline_event_base_state.xml b/vector/src/main/res/layout/item_timeline_event_base_state.xml
index 8f5985ef8e..db5ed052f3 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_state.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_state.xml
@@ -78,7 +78,6 @@
         android:layout_marginTop="4dp"
         android:layout_toStartOf="@id/viewStubContainer"
         android:visibility="gone"
-        tools:src="@drawable/ic_shield_warning"
         tools:visibility="visible" />
 
     <ImageView
diff --git a/vector/src/main/res/layout/item_timeline_event_file_stub.xml b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
index ec9d79f4ec..67b520c269 100644
--- a/vector/src/main/res/layout/item_timeline_event_file_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
@@ -15,7 +15,6 @@
         android:visibility="gone"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/ic_shield_black"
         tools:visibility="visible" />
 
     <!-- the media type -->