diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-21 22:33:46 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-21 22:33:46 +0200 |
| commit | 477a189c3f11e4863bc771ab7cbe9e39f8ae154b (patch) | |
| tree | 4b04729e11d81982b1c438223657868bd68a8153 /OpenKeychain/src/main/res/layout | |
| parent | 97ca5091c237ff185a1a5651ff54752a3e49adc3 (diff) | |
| parent | 7eb9f5d5cfb3e735076ea019013f89ca60ed5804 (diff) | |
| download | open-keychain-477a189c3f11e4863bc771ab7cbe9e39f8ae154b.tar.gz open-keychain-477a189c3f11e4863bc771ab7cbe9e39f8ae154b.tar.bz2 open-keychain-477a189c3f11e4863bc771ab7cbe9e39f8ae154b.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
4 files changed, 3 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml index e1c8db383..7fa581905 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml @@ -156,7 +156,7 @@ android:drawableLeft="@drawable/ic_repeat_black_24dp" android:drawableStart="@drawable/ic_repeat_black_24dp" android:drawablePadding="12dp" - android:text="@string/linked_button_retry" + android:text="@string/linked_button_retry_step" android:id="@+id/button_retry" /> diff --git a/OpenKeychain/src/main/res/layout/linked_id_item.xml b/OpenKeychain/src/main/res/layout/linked_id_item.xml index e4fe58551..d6e437dd5 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_item.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_item.xml @@ -6,7 +6,6 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:orientation="horizontal" android:singleLine="true" - android:background="#ffffff" tools:showIn="@layout/linked_id_view_fragment"> <ImageView diff --git a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml index 377ce4fb6..8b275fcef 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml @@ -14,7 +14,7 @@ android:transitionName="card_linked_ids" android:layout_width="match_parent" android:layout_height="wrap_content" - card_view:cardBackgroundColor="@android:color/white" + card_view:cardBackgroundColor="?attr/colorCardViewBackground" card_view:cardElevation="2dp" card_view:cardUseCompatPadding="true" card_view:cardCornerRadius="4dp"> diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml index 5bf36f564..8715945bf 100644 --- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:visibility="gone" tools:visibility="visible" - card_view:cardBackgroundColor="@android:color/white" + card_view:cardBackgroundColor="?attr/colorCardViewBackground" card_view:cardElevation="2dp" card_view:cardUseCompatPadding="true" card_view:cardCornerRadius="4dp"> |