From 4ccd9f9bb148a75e9cde48648216d1037a617c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 27 Feb 2015 01:38:57 +0100
Subject: Uncluttering advanced key view

---
 .../main/res/layout/view_key_adv_main_fragment.xml | 88 ----------------------
 .../res/layout/view_key_adv_share_fragment.xml     | 45 -----------
 2 files changed, 133 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
index 6d0ed3298..d4272b816 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
@@ -71,94 +71,6 @@
             android:layout_height="1dip"
             android:background="?android:attr/listDivider" />
 
-        <TextView
-            android:id="@+id/view_key_action_edit"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:text="@string/key_view_action_edit"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_edit"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-        <View
-            android:id="@+id/view_key_action_edit_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-
-        <LinearLayout
-            android:id="@+id/view_key_action_encrypt_text"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/view_key_action_encrypt_text_text"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_encrypt"
-                android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_secure"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <TextView
-                android:id="@+id/view_key_action_encrypt_files"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_encrypt_files"
-                android:drawableRight="@drawable/ic_action_secure"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/view_key_action_update"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:text="@string/key_view_action_update"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_download"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
     </LinearLayout>
 
 </ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
index cd8f96e6f..127fe36de 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -162,51 +162,6 @@
             android:drawablePadding="8dp"
             android:gravity="center_vertical" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <LinearLayout
-            android:id="@+id/view_key_action_nfc_help"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal"
-            android:layout_marginBottom="8dp">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_share_nfc"
-                android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_help"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/view_key_action_nfc_prefs"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_settings"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
     </LinearLayout>
 
 </ScrollView>
-- 
cgit v1.2.3