diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-10 04:56:51 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-10 04:56:51 +0100 |
| commit | 531697ffe79384f214033bd4096aa0b177e5517d (patch) | |
| tree | c48bc03238a5d444f1714bb82684d962b499d076 /OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml | |
| parent | 3b7f21d98a667abec9cb9ddf855893b3a1ffdb8b (diff) | |
| parent | b3257e0ffa53f93d550d71c1a5ffcecb4f4df0e5 (diff) | |
| download | open-keychain-531697ffe79384f214033bd4096aa0b177e5517d.tar.gz open-keychain-531697ffe79384f214033bd4096aa0b177e5517d.tar.bz2 open-keychain-531697ffe79384f214033bd4096aa0b177e5517d.zip | |
Merge remote-tracking branch 'origin/development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
OpenKeychain/src/main/res/layout/view_key_fragment.xml
Diffstat (limited to 'OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml index 33db6ed5f..d4df74e37 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml @@ -99,7 +99,7 @@ android:text="@string/btn_back" android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:gravity="center_vertical" android:layout_gravity="center_vertical" /> @@ -124,7 +124,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:layout_gravity="center_vertical" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file |