From 484a9371b7915f5c6c3dd2088cc5ff48642f4bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 4 Mar 2015 20:40:55 +0100
Subject: Remove help button for now

---
 Graphics/get-material-icons.sh                        |   1 -
 .../main/res/drawable-hdpi/ic_help_grey600_24dp.png   | Bin 655 -> 0 bytes
 .../main/res/drawable-mdpi/ic_help_grey600_24dp.png   | Bin 484 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_help_grey600_24dp.png  | Bin 838 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_help_grey600_24dp.png | Bin 1183 -> 0 bytes
 .../res/drawable-xxxhdpi/ic_help_grey600_24dp.png     | Bin 1675 -> 0 bytes
 .../src/main/res/layout/view_key_fragment.xml         |  18 +++---------------
 7 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey600_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_help_grey600_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_help_grey600_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_grey600_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_grey600_24dp.png

diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh
index ae2914a89..b1d4c7a0e 100755
--- a/Graphics/get-material-icons.sh
+++ b/Graphics/get-material-icons.sh
@@ -34,7 +34,6 @@ python copy OpenKeychain navigation grey close 24
 python copy OpenKeychain social grey person 24
 python copy OpenKeychain social grey person_add 24
 python copy OpenKeychain social grey share 24
-python copy OpenKeychain action grey help 24
 
 # navigation drawer sections
 python copy OpenKeychain communication black vpn_key 24
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey600_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey600_24dp.png
deleted file mode 100644
index 9f24b7b60..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey600_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_help_grey600_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_grey600_24dp.png
deleted file mode 100644
index 42032d918..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_help_grey600_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_grey600_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_grey600_24dp.png
deleted file mode 100644
index 72c7e7bb0..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_grey600_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_grey600_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_grey600_24dp.png
deleted file mode 100644
index d0d0224df..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_grey600_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_grey600_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_grey600_24dp.png
deleted file mode 100644
index 9d14c61a2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_grey600_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index 9a75d59e6..bba412f99 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -22,35 +22,23 @@
             card_view:cardUseCompatPadding="true"
             card_view:cardCornerRadius="4dp">
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
                 <TextView
-                    android:id="@+id/view_key_header"
                     style="@style/CardViewHeader"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/section_user_ids" />
 
-                <ImageButton
-                    android:id="@+id/view_key_help"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:layout_margin="2dp"
-                    style="?android:attr/borderlessButtonStyle"
-                    android:src="@drawable/ic_help_grey600_24dp"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignBottom="@+id/view_key_header" />
-
                 <org.sufficientlysecure.keychain.ui.widget.FixedListView
                     android:id="@+id/view_key_user_ids"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@+id/view_key_header" />
-            </RelativeLayout>
+                    android:layout_marginBottom="4dp" />
+            </LinearLayout>
         </android.support.v7.widget.CardView>
 
 
-- 
cgit v1.2.3