diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-23 23:31:28 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-23 23:31:28 +0200 |
commit | 76a1e99d7e30679722ffe2cb0c8c12b048adc369 (patch) | |
tree | d488809449e0465d82f187f54d083b042ab930a8 /OpenKeychain/src/main/res | |
parent | 214b60cd0049c90ea120401646c9d9ae707dc4ad (diff) | |
parent | ecfa2288eb58c631900261270a99c8dcf27b4b4d (diff) | |
download | open-keychain-76a1e99d7e30679722ffe2cb0c8c12b048adc369.tar.gz open-keychain-76a1e99d7e30679722ffe2cb0c8c12b048adc369.tar.bz2 open-keychain-76a1e99d7e30679722ffe2cb0c8c12b048adc369.zip |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/res')
3 files changed, 12 insertions, 14 deletions
diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml index 8a0519872..9140ad07b 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml @@ -6,8 +6,7 @@ android:layout_height="wrap_content" android:background="@color/holo_gray_bright"> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/result_main_layout" + <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -99,7 +98,6 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="@color/tertiary_text_light" android:text="alice@example.com (set in-code)" android:gravity="center_vertical" /> diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml index c58e2d7e6..cbe03056c 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml @@ -98,16 +98,16 @@ android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/decrypt_invalid_text" - android:padding="8dp" + android:padding="16dp" android:layout_gravity="center" - android:textColor="@color/android_red_dark" /> + android:textColor="@color/android_red_light" /> <Button android:id="@+id/decrypt_text_invalid_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/button_edgy" - android:textColor="@color/android_red_dark" + android:textColor="@color/android_red_light" android:text="@string/decrypt_invalid_button" android:layout_gravity="center_horizontal" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index 7428d68e2..df69e4237 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.xml @@ -22,14 +22,14 @@ android:paddingBottom="4dp"> <TextView - android:id="@+id/mainUserId" + android:id="@+id/key_list_item_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/label_main_user_id" android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView - android:id="@+id/mainUserIdRest" + android:id="@+id/key_list_item_email" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" @@ -39,9 +39,9 @@ </LinearLayout> <LinearLayout - android:id="@+id/slinger_view" + android:id="@+id/key_list_item_slinger_view" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="?android:attr/listPreferredItemHeight" android:layout_gravity="center_vertical" android:orientation="horizontal"> @@ -54,18 +54,18 @@ android:background="?android:attr/listDivider" /> <ImageButton - android:id="@+id/slinger_button" + android:id="@+id/key_list_item_slinger_button" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_gravity="center" android:src="@drawable/ic_action_safeslinger" - android:padding="16dp" + android:padding="12dp" style="@style/SelectableItem" /> </LinearLayout> <ImageView - android:id="@+id/status_icon" + android:id="@+id/key_list_item_status_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" |