diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-30 23:42:38 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-30 23:42:38 +0200 |
| commit | 19ecd5f42717ea325cb646b46ab06b9340015875 (patch) | |
| tree | dee1e05e455302895beda4c4d09fe9ebba1924d8 /OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml | |
| parent | b0a51e7dd30b7f921d575e1e360670cbfed7be6c (diff) | |
| parent | d67b546ec52c94faf71733b063856de98d66ef01 (diff) | |
| download | open-keychain-19ecd5f42717ea325cb646b46ab06b9340015875.tar.gz open-keychain-19ecd5f42717ea325cb646b46ab06b9340015875.tar.bz2 open-keychain-19ecd5f42717ea325cb646b46ab06b9340015875.zip | |
Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychain into v/crypto-input-parcel
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml index 5831d52e1..b75ec5022 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml @@ -4,15 +4,11 @@ android:layout_height="match_parent" android:orientation="vertical"> - <ListView + <android.support.v7.widget.RecyclerView android:id="@+id/selected_files_list" - android:dividerHeight="4dip" - android:divider="@android:color/transparent" - android:focusable="true" - android:focusableInTouchMode="true" android:paddingLeft="16dp" android:paddingRight="16dp" - android:layout_marginTop="8dp" + android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="match_parent" /> |