diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-02-26 22:26:40 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-02-26 22:26:40 +0530 |
commit | 99ff9d2340689e1ebc274e463c86af0a03806491 (patch) | |
tree | 7b3071c21dab1d026adfd5462ceaea31651c029e /OpenKeychain/src/main/res/layout/qr_code_activity.xml | |
parent | ec353b0c390f7b3f45b950171e56c6ddcd0a9607 (diff) | |
parent | 1210a80a96d9f862829ac1122e94b68fe8b8b5d7 (diff) | |
download | open-keychain-99ff9d2340689e1ebc274e463c86af0a03806491.tar.gz open-keychain-99ff9d2340689e1ebc274e463c86af0a03806491.tar.bz2 open-keychain-99ff9d2340689e1ebc274e463c86af0a03806491.zip |
merged dialog
Diffstat (limited to 'OpenKeychain/src/main/res/layout/qr_code_activity.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/qr_code_activity.xml | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/layout/qr_code_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_activity.xml index 11b502b34..4ce097f40 100644 --- a/OpenKeychain/src/main/res/layout/qr_code_activity.xml +++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -13,12 +14,24 @@ android:layout_height="match_parent" android:orientation="vertical"> - <ImageView - android:id="@+id/qr_code_image" - android:padding="32dp" + <android.support.v7.widget.CardView + android:id="@+id/qr_code_image_layout" + android:transitionName="qr_code" + android:layout_margin="32dp" android:layout_width="match_parent" - android:layout_height="match_parent" - style="@style/SelectableItem" /> + android:layout_height="wrap_content" + android:clickable="true" + android:foreground="?android:attr/selectableItemBackground" + app:cardBackgroundColor="@android:color/white" + app:cardUseCompatPadding="true" + app:cardCornerRadius="4dp"> + + <org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView + android:id="@+id/qr_code_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:aspectRatioEnabled="true" /> + </android.support.v7.widget.CardView> </LinearLayout> </RelativeLayout>
\ No newline at end of file |