diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-04 15:26:09 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-04 15:26:09 +0100 |
| commit | 502a0b5376993a87d4d249b163156433c7c12053 (patch) | |
| tree | 79d03bf886c17236a995847208486b89975c7b31 /OpenKeychain/src | |
| parent | 2389ce9aebf46ab8e12fc4d60aa892615fe10123 (diff) | |
| download | open-keychain-502a0b5376993a87d4d249b163156433c7c12053.tar.gz open-keychain-502a0b5376993a87d4d249b163156433c7c12053.tar.bz2 open-keychain-502a0b5376993a87d4d249b163156433c7c12053.zip | |
Crop image view to center
Diffstat (limited to 'OpenKeychain/src')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | 5 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_activity.xml | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index 2aa9edd44..94f2bf92b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -76,7 +76,6 @@ import org.sufficientlysecure.keychain.ui.util.FormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.ui.util.QrCodeUtils; -import org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView; import org.sufficientlysecure.keychain.util.ContactHelper; import org.sufficientlysecure.keychain.util.ExportHelper; import org.sufficientlysecure.keychain.util.Log; @@ -104,7 +103,7 @@ public class ViewKeyActivity extends BaseActivity implements private ImageButton mActionEncryptText; private ImageButton mActionNfc; private FloatingActionButton mFab; - private AspectRatioImageView mPhoto; + private ImageView mPhoto; private ImageView mQrCode; private CardView mQrCodeLayout; @@ -146,7 +145,7 @@ public class ViewKeyActivity extends BaseActivity implements mActionEncryptText = (ImageButton) findViewById(R.id.view_key_action_encrypt_text); mActionNfc = (ImageButton) findViewById(R.id.view_key_action_nfc); mFab = (FloatingActionButton) findViewById(R.id.fab); - mPhoto = (AspectRatioImageView) findViewById(R.id.view_key_photo); + mPhoto = (ImageView) findViewById(R.id.view_key_photo); mQrCode = (ImageView) findViewById(R.id.view_key_qr_code); mQrCodeLayout = (CardView) findViewById(R.id.view_key_qr_code_layout); diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index a69efaf75..314d93be8 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -15,12 +15,11 @@ android:background="?attr/colorPrimary" android:orientation="horizontal"> - <org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView + <ImageView android:id="@+id/view_key_photo" - app:aspectRatioEnabled="true" android:visibility="gone" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_below="@+id/status_bar" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" @@ -29,7 +28,8 @@ android:cropToPadding="false" android:focusable="false" android:adjustViewBounds="false" - android:layout_alignParentTop="false" /> + android:layout_alignParentTop="false" + android:scaleType="centerCrop" /> <ImageView android:id="@+id/status_bar" |