moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

Full height contact pic in key view

Browse Source
This commit is contained in:
Dominik Schürmann 2015-03-04 15:23:33 +01:00
parent 46944198e4
commit 2389ce9aeb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@ -930,27 +930,21 @@ public class ViewKeyActivity extends BaseActivity implements
} }
if (mPreviousColor == 0 || mPreviousColor == color) { if (mPreviousColor == 0 || mPreviousColor == color) {
mToolbar.setBackgroundColor(color);
mStatusBar.setBackgroundColor(color); mStatusBar.setBackgroundColor(color);
mBigToolbar.setBackgroundColor(color); mBigToolbar.setBackgroundColor(color);
mPreviousColor = color; mPreviousColor = color;
} else { } else {
ObjectAnimator colorFade1 = ObjectAnimator colorFade1 =
ObjectAnimator.ofObject(mToolbar, "backgroundColor",
new ArgbEvaluator(), mPreviousColor, color);
ObjectAnimator colorFade2 =
ObjectAnimator.ofObject(mStatusBar, "backgroundColor", ObjectAnimator.ofObject(mStatusBar, "backgroundColor",
new ArgbEvaluator(), mPreviousColor, color); new ArgbEvaluator(), mPreviousColor, color);
ObjectAnimator colorFade3 = ObjectAnimator colorFade2 =
ObjectAnimator.ofObject(mBigToolbar, "backgroundColor", ObjectAnimator.ofObject(mBigToolbar, "backgroundColor",
new ArgbEvaluator(), mPreviousColor, color); new ArgbEvaluator(), mPreviousColor, color);
colorFade1.setDuration(1200); colorFade1.setDuration(1200);
colorFade2.setDuration(1200); colorFade2.setDuration(1200);
colorFade3.setDuration(1200);
colorFade1.start(); colorFade1.start();
colorFade2.start(); colorFade2.start();
colorFade3.start();
mPreviousColor = color; mPreviousColor = color;
} }

8
OpenKeychain/src/main/res/layout/view_key_activity.xml
View File

@ -24,7 +24,12 @@
android:layout_below="@+id/status_bar" android:layout_below="@+id/status_bar"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="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 <ImageView
android:id="@+id/status_bar" android:id="@+id/status_bar"
@ -34,6 +39,7 @@
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:background="@color/transparent"
android:layout_below="@+id/status_bar" android:layout_below="@+id/status_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"