Merge branch 'master' into mime4j

Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
	OpenKeychain/src/main/res/values/strings.xml

OpenKeychain/src/main/res/anim/fade_in_down.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromYDelta="-10" android:toYDelta="0"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:duration="200"
+        />
+    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:duration="200"
+        />
+</set>

OpenKeychain/src/main/res/anim/fade_in_quick.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+        android:interpolator="@android:anim/bounce_interpolator"
+        android:duration="400"
+        />
+</set>

OpenKeychain/src/main/res/anim/fade_in_up.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromYDelta="10" android:toYDelta="0"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:duration="200"
+        />
+    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:duration="200"
+        />
+</set>

OpenKeychain/src/main/res/anim/fade_out_down.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromYDelta="0.0" android:toYDelta="10"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:duration="200"
+        />
+    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:duration="150"
+        />
+</set>

OpenKeychain/src/main/res/anim/fade_out_quick.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:duration="150"
+        />
+</set>

OpenKeychain/src/main/res/anim/fade_out_up.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromYDelta="0.0" android:toYDelta="-10"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:duration="200"
+        />
+    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:duration="150"
+        />
+</set>

OpenKeychain/src/main/res/drawable/divider.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <size
+        android:height="1px"
+        android:width="1000dp" />
+
+    <solid android:color="#eeeeee" />
+
+</shape>

OpenKeychain/src/main/res/drawable/scrim_bottom.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="90"
+        android:startColor="@color/translucent_scrim_bottom"
+        android:centerColor="@color/translucent_scrim_bottom_center"
+        android:endColor="@android:color/transparent"/>
+</shape>

OpenKeychain/src/main/res/layout/api_app_settings_activity.xml

@@ -29,7 +29,7 @@
             android:minHeight="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             android:overScrollMode="always"
-            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
             tools:ignore="UnusedAttribute"
             android:transitionGroup="false"
@@ -46,7 +46,7 @@
                 android:id="@+id/api_app_settings_app_icon"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:src="@drawable/ic_launcher" />
+                android:src="@mipmap/ic_launcher" />
 
             <TextView
                 android:id="@+id/api_app_settings_app_name"

OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml

@@ -17,7 +17,7 @@
             android:layout_height="48dp"
             android:layout_alignParentTop="true"
             android:layout_marginRight="6dp"
-            android:src="@drawable/ic_launcher" />
+            android:src="@mipmap/ic_launcher" />
 
         <TextView
             android:id="@+id/api_app_settings_app_name"
@@ -65,4 +65,4 @@
 
     </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
 
-</LinearLayout>
+</LinearLayout>

OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml

@@ -11,7 +11,7 @@
         android:layout_height="48dp"
         android:layout_marginLeft="8dp"
         android:layout_centerVertical="true"
-        android:src="@drawable/ic_launcher" />
+        android:src="@mipmap/ic_launcher" />
 
     <ImageView
         android:id="@+id/api_apps_adapter_install_icon"
@@ -34,4 +34,4 @@
         android:layout_toLeftOf="@+id/api_apps_adapter_install_icon"
         android:layout_toRightOf="@+id/api_apps_adapter_item_icon" />
 
-</RelativeLayout>
+</RelativeLayout>

OpenKeychain/src/main/res/layout/cert_list_widget.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.sufficientlysecure.keychain.ui.widget.CertListWidget
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/linked_id_certs"
+    tools:showIn="@layout/linked_id_view_fragment">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        tools:ignore="UseCompoundDrawables">
+
+        <TextView
+            android:id="@+id/cert_collapsed_list"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical"
+            android:layout_weight="1"
+            tools:text="The identity is not yet verified or confirmed."
+            />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:src="@drawable/ic_expand_more_black_24dp"
+            android:id="@+id/cert_expand_button"
+            android:padding="4dp"
+            />
+
+        </LinearLayout>
+
+    <ListView
+        android:id="@+id/cert_expanded_list"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+    </ListView>
+
+</org.sufficientlysecure.keychain.ui.widget.CertListWidget>

OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml

@@ -16,6 +16,7 @@
             android:padding="16dp">
 
             <TextView
+                android:id="@+id/certify_fingerprint_intro"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="8dp"

OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml

@@ -8,11 +8,11 @@
 
     <LinearLayout
         android:visibility="gone"
-        tools:visibility="visible"
         android:id="@+id/decrypt_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        tools:visibility="visible">
 
         <ScrollView
             android:fillViewport="true"
@@ -39,12 +39,12 @@
     </LinearLayout>
 
     <LinearLayout
-        android:visibility="gone"
         android:id="@+id/decrypt_error_overlay"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:gravity="center_vertical">
+        android:gravity="center_vertical"
+        android:visibility="gone">
 
         <TextView
             android:layout_width="wrap_content"
@@ -65,4 +65,4 @@
             android:layout_gravity="center_horizontal" />
     </LinearLayout>
 
-</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
+</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>

OpenKeychain/src/main/res/layout/help_about_fragment.xml

@@ -32,7 +32,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="top"
                     android:layout_marginRight="10dp"
-                    android:src="@drawable/ic_launcher" />
+                    android:src="@mipmap/ic_launcher" />
             </LinearLayout>
 
             <LinearLayout

OpenKeychain/src/main/res/layout/key_list_fragment.xml

@@ -63,7 +63,7 @@
             fab:fab_icon="@drawable/ic_qrcode_white_24dp"
             fab:fab_colorNormal="?attr/colorPrimary"
             fab:fab_colorPressed="?attr/colorPrimaryDark"
-            fab:fab_title="Scan QR Code"
+            fab:fab_title="@string/key_list_fab_qr_code"
             fab:fab_size="mini" />
 
         <com.getbase.floatingactionbutton.FloatingActionButton
@@ -73,7 +73,7 @@
             fab:fab_icon="@drawable/ic_cloud_search_24dp"
             fab:fab_colorNormal="?attr/colorPrimary"
             fab:fab_colorPressed="?attr/colorPrimaryDark"
-            fab:fab_title="Search Cloud"
+            fab:fab_title="@string/key_list_fab_search"
             fab:fab_size="mini" />
 
         <com.getbase.floatingactionbutton.FloatingActionButton
@@ -83,7 +83,7 @@
             fab:fab_icon="@drawable/ic_folder_white_24dp"
             fab:fab_colorNormal="?attr/colorPrimary"
             fab:fab_colorPressed="?attr/colorPrimaryDark"
-            fab:fab_title="Import from File"
+            fab:fab_title="@string/key_list_fab_import"
             fab:fab_size="mini" />
 
     </com.getbase.floatingactionbutton.FloatingActionsMenu>

OpenKeychain/src/main/res/layout/keyspinner_item_none.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
@@ -13,7 +14,8 @@
         android:id="@+id/keyspinner_key_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/choice_none"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        tools:text="@string/choice_none"
+        />
 
 </LinearLayout>

OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml

@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    xmlns:custom="http://schemas.android.com/apk/res-auto">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="false"
+        android:layout_above="@+id/create_key_button_divider">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:src="@drawable/linked_github" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_margin="8dp"
+                    android:src="@drawable/octo_link_24dp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_margin="8dp"
+                    android:src="@drawable/account_key" />
+
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:text="@string/linked_github_text"
+                style="?android:textAppearanceSmall"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <org.sufficientlysecure.keychain.ui.widget.StatusIndicator
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:id="@+id/linked_status_step1"
+                        android:layout_margin="4dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="@string/linked_progress_auth_github"
+                        style="?android:textAppearanceMedium"
+                        />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <org.sufficientlysecure.keychain.ui.widget.StatusIndicator
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:id="@+id/linked_status_step2"
+                        android:layout_margin="4dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="@string/linked_progress_post_gist"
+                        style="?android:textAppearanceMedium"
+                        />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <org.sufficientlysecure.keychain.ui.widget.StatusIndicator
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:id="@+id/linked_status_step3"
+                        android:layout_margin="4dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="@string/linked_progress_update_key"
+                        style="?android:textAppearanceMedium"
+                        />
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/button_container"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:layout_marginRight="4dp"
+                android:layout_marginLeft="4dp"
+                android:inAnimation="@anim/fade_in"
+                android:outAnimation="@anim/fade_out"
+                android:clipChildren="false"
+                custom:initialView="3">
+
+                <Button
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:drawableLeft="@drawable/link_24dp"
+                    android:drawableStart="@drawable/link_24dp"
+                    android:drawablePadding="12dp"
+                    android:text="@string/linked_button_start"
+                    android:id="@+id/button_send"
+                    />
+
+                <Space
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+                <include layout="@layout/linked_id_item" />
+
+                <Button
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:drawableLeft="@drawable/ic_repeat_black_24dp"
+                    android:drawableStart="@drawable/ic_repeat_black_24dp"
+                    android:drawablePadding="12dp"
+                    android:text="@string/linked_button_retry"
+                    android:id="@+id/button_retry"
+                    />
+
+            </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <View
+        android:id="@+id/create_key_button_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:background="?android:attr/listDivider"
+        android:layout_alignTop="@+id/create_key_buttons"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:id="@+id/create_key_buttons">
+
+        <TextView
+            android:id="@+id/back_button"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_back"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:textAllCaps="true"
+            style="?android:attr/borderlessButtonStyle"
+            android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:clickable="true"
+            android:layout_gravity="center_vertical" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_finish"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:textAllCaps="true"
+            android:drawableRight="@drawable/ic_person_add_grey_24dp"
+            android:drawablePadding="8dp"
+            style="?android:attr/borderlessButtonStyle"
+            android:gravity="center_vertical|right"
+            android:layout_gravity="center_vertical"
+            android:visibility="invisible" />
+    </LinearLayout>
+
+</RelativeLayout>

OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="false"
+        android:layout_above="@+id/create_key_button_divider">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawableLeft="@drawable/linked_https"
+                android:drawablePadding="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/linked_create_https_1_1" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/linked_create_https_1_2" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/linked_create_https_1_3" />
+
+            <org.sufficientlysecure.keychain.ui.widget.PrefixedEditText
+                android:id="@+id/linked_create_https_uri"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionNext"
+                android:layout_marginTop="16dp"
+                android:ems="10"
+                android:inputType="textUri"
+                android:layout_gravity="center_horizontal"
+                custom:prefix="https://"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/linked_create_https_1_4" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <View
+        android:id="@+id/create_key_button_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:background="?android:attr/listDivider"
+        android:layout_alignTop="@+id/create_key_buttons"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:id="@+id/create_key_buttons">
+
+        <TextView
+            android:id="@+id/back_button"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_back"
+            android:clickable="true"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:textAllCaps="true"
+            style="?android:attr/borderlessButtonStyle"
+            android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:layout_gravity="center_vertical" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/next_button"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_next"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:textAllCaps="true"
+            android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical|right"
+            style="?android:attr/borderlessButtonStyle"
+            android:clickable="true"
+            android:layout_gravity="center_vertical" />
+    </LinearLayout>
+</RelativeLayout>

OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml

@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="false"
+        android:layout_above="@+id/create_key_button_divider">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/linked_create_https_2_1" />
+
+            <EditText
+                android:id="@+id/linked_create_https_uri"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionNext"
+                android:layout_marginTop="8dp"
+                android:hint="uri"
+                android:ems="10"
+                android:layout_gravity="center_horizontal"
+                android:inputType="textUri|none"
+                android:enabled="false"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/linked_create_https_2_2" />
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_gravity="center_horizontal"
+                style="?android:buttonBarStyle"
+                >
+
+                <Button
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    style="?android:buttonBarButtonStyle"
+                    android:drawableLeft="@android:drawable/ic_menu_save"
+                    android:drawableStart="@android:drawable/ic_menu_save"
+                    android:text="Save"
+                    android:id="@+id/button_save"
+                    />
+
+                <Button
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    style="?android:buttonBarButtonStyle"
+                    android:drawableLeft="@android:drawable/ic_menu_share"
+                    android:drawableStart="@android:drawable/ic_menu_share"
+                    android:text="Share"
+                    android:id="@+id/button_send"
+                    />
+
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/linked_create_https_2_3" />
+
+            <include layout="@layout/linked_create_verify" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/linked_create_https_2_4" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <View
+        android:id="@+id/create_key_button_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:background="?android:attr/listDivider"
+        android:layout_alignTop="@+id/create_key_buttons"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:id="@+id/create_key_buttons">
+
+        <TextView
+            android:id="@+id/back_button"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_back"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            android:textAllCaps="true"
+            style="?android:attr/borderlessButtonStyle"
+            android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:layout_gravity="center_vertical" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/next_button"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_finish"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:textAllCaps="true"
+            android:drawableRight="@drawable/ic_person_add_grey_24dp"
+            android:drawablePadding="8dp"
+            style="?android:attr/borderlessButtonStyle"
+            android:gravity="center_vertical|right"
+            android:layout_gravity="center_vertical" />
+    </LinearLayout>
+</RelativeLayout>