diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 12:10:51 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 12:10:51 +0100 |
| commit | 7b3bc4ca98c2be52bec996287c5997c3c52e3603 (patch) | |
| tree | 861f5c7d329ea8c96e673b2c16f068d593a55fb9 /OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml | |
| parent | 98ce06dbc9bea56d2960df2d7b8e7a5bc9e9e43a (diff) | |
| parent | 8c8fdd6c495bb12f5c76c9d1fc4a6a44f1c3808b (diff) | |
| download | open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.tar.gz open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.tar.bz2 open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml index 4db33121b..e726c48be 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml @@ -78,7 +78,7 @@ <ImageView android:id="@+id/verify_image" - android:src="@drawable/status_signature_unverified_cutout_24px" + android:src="@drawable/status_signature_unverified_cutout_24dp" android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -180,7 +180,7 @@ android:layout_weight="1" android:text="@string/btn_next" android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_action_play" + android:drawableRight="@drawable/ic_done_grey_24dp" android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" |