diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-04 15:23:33 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-04 15:23:33 +0100 |
| commit | 2389ce9aebf46ab8e12fc4d60aa892615fe10123 (patch) | |
| tree | 04204ffefaed1f61b6fb9df8a2ffde29194e07dc /OpenKeychain/src | |
| parent | 46944198e4a4433025c92eb767118ed5bd4a9e14 (diff) | |
| download | open-keychain-2389ce9aebf46ab8e12fc4d60aa892615fe10123.tar.gz open-keychain-2389ce9aebf46ab8e12fc4d60aa892615fe10123.tar.bz2 open-keychain-2389ce9aebf46ab8e12fc4d60aa892615fe10123.zip | |
Full height contact pic in key view
Diffstat (limited to 'OpenKeychain/src')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | 8 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_activity.xml | 8 |
2 files changed, 8 insertions, 8 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 9b0f1b319..2aa9edd44 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -930,27 +930,21 @@ public class ViewKeyActivity extends BaseActivity implements } if (mPreviousColor == 0 || mPreviousColor == color) { - mToolbar.setBackgroundColor(color); mStatusBar.setBackgroundColor(color); mBigToolbar.setBackgroundColor(color); mPreviousColor = color; } else { ObjectAnimator colorFade1 = - ObjectAnimator.ofObject(mToolbar, "backgroundColor", - new ArgbEvaluator(), mPreviousColor, color); - ObjectAnimator colorFade2 = ObjectAnimator.ofObject(mStatusBar, "backgroundColor", new ArgbEvaluator(), mPreviousColor, color); - ObjectAnimator colorFade3 = + ObjectAnimator colorFade2 = ObjectAnimator.ofObject(mBigToolbar, "backgroundColor", new ArgbEvaluator(), mPreviousColor, color); colorFade1.setDuration(1200); colorFade2.setDuration(1200); - colorFade3.setDuration(1200); colorFade1.start(); colorFade2.start(); - colorFade3.start(); mPreviousColor = color; } diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 1a45370a5..a69efaf75 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -24,7 +24,12 @@ android:layout_below="@+id/status_bar" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:src="@drawable/first_time_1" /> + android:src="@drawable/ic_launcher" + android:baselineAlignBottom="false" + android:cropToPadding="false" + android:focusable="false" + android:adjustViewBounds="false" + android:layout_alignParentTop="false" /> <ImageView android:id="@+id/status_bar" @@ -34,6 +39,7 @@ <android.support.v7.widget.Toolbar android:id="@+id/toolbar" + android:background="@color/transparent" android:layout_below="@+id/status_bar" android:layout_width="match_parent" android:layout_height="wrap_content" |