diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-28 16:10:36 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-28 16:10:36 +0200 |
commit | ed6a89f35c21e92108036ec40722c1a3f9d8641c (patch) | |
tree | bc65bc0b30ebb783990f3970da7e6b376b555dbf /OpenKeychain/src/main/res/layout | |
parent | 23689da56db1c4f5e53d6e028a619f357a73586c (diff) | |
download | open-keychain-ed6a89f35c21e92108036ec40722c1a3f9d8641c.tar.gz open-keychain-ed6a89f35c21e92108036ec40722c1a3f9d8641c.tar.bz2 open-keychain-ed6a89f35c21e92108036ec40722c1a3f9d8641c.zip |
Use new icons in other key related activites, delete old icons
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
3 files changed, 28 insertions, 30 deletions
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml index 1443ffd46..d9c1b806b 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml @@ -106,7 +106,6 @@ style="@style/SectionHeader" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" android:layout_marginTop="14dp" android:text="@string/section_uids_to_certify" /> @@ -149,21 +148,35 @@ android:text="@string/section_actions" android:layout_weight="1" /> - <TextView - android:id="@+id/sign_key_sign_button" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:layout_marginBottom="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" + <LinearLayout + android:id="@+id/certify_key_certify_button" android:layout_width="match_parent" - android:layout_height="match_parent" - android:text="@string/key_view_action_certify" - android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_action_good" - android:drawablePadding="8dp" - android:gravity="center_vertical" + android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" - style="@style/SelectableItem" /> + android:paddingRight="4dp" + android:layout_marginBottom="8dp" + style="@style/SelectableItem" + android:orientation="horizontal"> + + <TextView + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="0dip" + android:layout_height="match_parent" + android:text="@string/key_view_action_certify" + android:layout_weight="1" + android:gravity="center_vertical" /> + + <ImageView + android:id="@+id/certify_key_action_certify_image" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/status_signature_verified_cutout" + android:layout_gravity="center_vertical" /> + + </LinearLayout> + </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml index 56441774f..b11538ba9 100644 --- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml @@ -35,21 +35,6 @@ android:layout_height="1dip" android:background="?android:attr/listDivider" /> - <!--<TextView--> - <!--android:id="@+id/view_key_action_certify"--> - <!--android:paddingLeft="8dp"--> - <!--android:paddingRight="8dp"--> - <!--android:textAppearance="?android:attr/textAppearanceMedium"--> - <!--android:layout_width="match_parent"--> - <!--android:layout_height="match_parent"--> - <!--android:text="@string/key_view_action_certify"--> - <!--android:minHeight="?android:attr/listPreferredItemHeight"--> - <!--android:drawableRight="@drawable/ic_action_good"--> - <!--android:drawablePadding="8dp"--> - <!--android:gravity="center_vertical"--> - <!--android:clickable="true"--> - <!--style="@style/SelectableItem" />--> - <LinearLayout android:id="@+id/view_key_action_certify" android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml index 7de2f9c05..916249b00 100644 --- a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml @@ -64,9 +64,9 @@ </LinearLayout> <ImageView + android:id="@+id/edit_image" android:layout_width="wrap_content" android:layout_height="match_parent" - android:id="@+id/edit_image" android:src="@drawable/ic_action_edit" android:padding="8dp" android:layout_gravity="center_horizontal" /> |