diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-23 10:57:33 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-23 10:57:33 +0100 |
commit | c1d268a5ecbb49a56561bd66c9b2967e282b9071 (patch) | |
tree | 64a403b504b77e5a97239f50f6410b15902f7ce5 /OpenKeychain/src/main/res | |
parent | 0784a0b4301b9bd15a80d135bdece19f44bc4258 (diff) | |
parent | 19967e235004abdf74e65e1388b9bc4816cfa2dd (diff) | |
download | open-keychain-c1d268a5ecbb49a56561bd66c9b2967e282b9071.tar.gz open-keychain-c1d268a5ecbb49a56561bd66c9b2967e282b9071.tar.bz2 open-keychain-c1d268a5ecbb49a56561bd66c9b2967e282b9071.zip |
Merge branch 'unyoungwax-qr-code-fullscreen'
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/qr_code_activity.xml | 7 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/attr.xml | 9 |
2 files changed, 3 insertions, 13 deletions
diff --git a/OpenKeychain/src/main/res/layout/qr_code_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_activity.xml index 5709bf0ff..47f5c06d8 100644 --- a/OpenKeychain/src/main/res/layout/qr_code_activity.xml +++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml @@ -27,12 +27,11 @@ app:cardUseCompatPadding="true" app:cardCornerRadius="4dp"> - <org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView + <ImageView android:id="@+id/qr_code_image" android:layout_width="match_parent" - android:layout_height="wrap_content" - app:dominantMeasurement="width" - app:aspectRatioEnabled="true" /> + android:layout_height="match_parent" + android:scaleType="centerInside"/> </android.support.v7.widget.CardView> </LinearLayout> diff --git a/OpenKeychain/src/main/res/values/attr.xml b/OpenKeychain/src/main/res/values/attr.xml index 1a414e6d9..7e8b98343 100644 --- a/OpenKeychain/src/main/res/values/attr.xml +++ b/OpenKeychain/src/main/res/values/attr.xml @@ -10,15 +10,6 @@ <attr name="unFoldedLabel" format="string" /> </declare-styleable> - <declare-styleable name="AspectRatioImageView"> - <attr name="aspectRatio" format="float" /> - <attr name="aspectRatioEnabled" format="boolean" /> - <attr name="dominantMeasurement"> - <enum name="width" value="0" /> - <enum name="height" value="1" /> - </attr> - </declare-styleable> - <!-- Taken from Matt Allen Password Strength View https://github.com/matt-allen/android-password-strength-indicator --> <declare-styleable name="PasswordStrengthView"> |