diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 11:09:25 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 11:09:25 +0200 |
| commit | e10cbc54c606563b2d06f083bca17119ca585127 (patch) | |
| tree | 23c71e67b1c4a381997bdb75de476f05d7dcec5f /OpenKeychain/src/main/res/layout/qr_code_activity.xml | |
| parent | bef3e621118d0e4d8fadedf0c9d67b6a9ff41883 (diff) | |
| parent | acbf2a18617eea73924dd109e09189420d9876fe (diff) | |
| download | open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.tar.gz open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.tar.bz2 open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.zip | |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/qr_code_activity.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/qr_code_activity.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout/qr_code_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_activity.xml new file mode 100644 index 000000000..57c869db6 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <ImageView + android:id="@+id/qr_code_image" + android:padding="32dp" + android:layout_width="match_parent" + android:layout_height="match_parent" + style="@style/SelectableItem" /> + +</LinearLayout>
\ No newline at end of file |