Merge branch 'android-allow-key-regeneration'

1 files changed, 39 insertions, 3 deletions

diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml
index 90d41fbebd..da2bb39207 100644
--- a/android/src/main/res/layout/wireguard_key.xml
+++ b/android/src/main/res/layout/wireguard_key.xml
@@ -87,7 +87,7 @@
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/wireguard_button_container"
+        android:id="@+id/wireguard_generate_button_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="15dp"
@@ -104,14 +104,50 @@
             android:orientation="vertical">
 
             <Button
-                android:id="@+id/wg_key_button"
+                android:id="@+id/wg_generate_key_button"
+                style="@style/Button"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:text="@string/wireguard_generate_key"/>
+
+            <ProgressBar
+                android:id="@+id/wg_generate_key_spinner"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:indeterminate="true"
+                android:indeterminateDrawable="@drawable/icon_spinner"
+                android:indeterminateDuration="600"
+                android:indeterminateOnly="true"
+                android:visibility="gone" />
+        </RelativeLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/wireguard_verify_button_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp"
+        android:background="@drawable/cell_button_background"
+        android:clickable="true"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <Button
+                android:id="@+id/wg_verify_key_button"
                 style="@style/Button"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
                 android:text="@string/wireguard_verify_key"/>
 
             <ProgressBar
-                android:id="@+id/wg_action_spinner"
+                android:id="@+id/wg_verify_key_spinner"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:indeterminate="true"