From f9bcf33d505ee89dbda96a7bb579a38ed21c8554 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Wed, 3 Jun 2015 23:55:11 +1000
Subject: [PATCH] WIP: Fixed minor UI issues.

"Confirm swap" background was white but should have been blue.

SwapWorkflowActivity now extends ActionBarActivity instead of
FragmentActivity so older devices have an action bar (though it is
not styled with blue action buttons on android-10 devices).
---
 F-Droid/res/layout/swap_confirm_receive.xml                    | 1 +
 F-Droid/res/values/styles.xml                                  | 2 --
 .../src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/F-Droid/res/layout/swap_confirm_receive.xml b/F-Droid/res/layout/swap_confirm_receive.xml
index d2e114e0c..899b1af2c 100644
--- a/F-Droid/res/layout/swap_confirm_receive.xml
+++ b/F-Droid/res/layout/swap_confirm_receive.xml
@@ -5,6 +5,7 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/swap_blue"
         android:padding="18dp">
     <!-- Padding is 32px * 0.56 = 18dip -->
 
diff --git a/F-Droid/res/values/styles.xml b/F-Droid/res/values/styles.xml
index 4c49996c2..d6d567356 100644
--- a/F-Droid/res/values/styles.xml
+++ b/F-Droid/res/values/styles.xml
@@ -153,8 +153,6 @@
     </style>
 
     <style name="SwapTheme.Wizard.ReceiveSwap" parent="SwapTheme.Wizard">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowFullscreen">true</item>
     </style>
 
     <!--
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index f6d52d9ec..7c28b6457 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -10,6 +10,7 @@ import android.os.Bundle;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.ActionBarActivity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -32,7 +33,7 @@ import org.fdroid.fdroid.localrepo.SwapManager;
 
 import java.util.Set;
 
-public class SwapWorkflowActivity extends FragmentActivity {
+public class SwapWorkflowActivity extends ActionBarActivity {
 
     private ViewGroup container;