cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix ViewKeyActivity layout issue"

Browse Source 
This reverts commit 70590ad421.
This commit is contained in:
Vincent Breitmoser
2018-02-16 17:58:53 +01:00
parent d4852ec19d
commit a835b5b594
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,20 +6,21 @@
android:id="@+id/main_content" android:id="@+id/main_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true" android:fitsSystemWindows="true">
>
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout
android:id="@+id/app_bar_layout" android:id="@+id/app_bar_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/primary" android:background="@color/primary"
android:fitsSystemWindows="true"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<android.support.design.widget.CollapsingToolbarLayout <android.support.design.widget.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar" android:id="@+id/collapsing_toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true"
app:contentScrim="@color/primary" app:contentScrim="@color/primary"
app:expandedTitleMarginBottom="102dp" app:expandedTitleMarginBottom="102dp"
app:expandedTitleMarginEnd="128dp" app:expandedTitleMarginEnd="128dp"
@@ -30,6 +31,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="238dp" android:layout_height="238dp"
android:fitsSystemWindows="true"
app:layout_collapseMode="parallax"> app:layout_collapseMode="parallax">
<FrameLayout <FrameLayout
@@ -39,6 +41,7 @@
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentTop="false" android:layout_alignParentTop="false"
android:fitsSystemWindows="true"
android:visibility="gone"> android:visibility="gone">
<ImageView <ImageView
@@ -46,9 +49,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:adjustViewBounds="false" android:adjustViewBounds="false"
android:baselineAlignBottom="false"
android:cropToPadding="false" android:cropToPadding="false"
android:fitsSystemWindows="true"
android:focusable="false" android:focusable="false"
android:scaleType="centerCrop" /> android:scaleType="centerCrop"
android:src="@mipmap/ic_launcher" />
<!-- text protection scrim --> <!-- text protection scrim -->
<View <View