Added a progressbar to ConfigurationWizard.

It resizes the provider list, pushing it down to show the progressbar
up, and back to the original layout after the operation.

3 files changed, 21 insertions, 7 deletions

diff --git a/res/layout/configuration_wizard_activity.xml b/res/layout/configuration_wizard_activity.xml
index 264ccf98..4bc4a8e1 100644
--- a/res/layout/configuration_wizard_activity.xml
+++ b/res/layout/configuration_wizard_activity.xml
@@ -5,4 +5,15 @@
     android:layout_height="match_parent"
     tools:context=".ConfigurationWizard" >
 
+    <ProgressBar
+        android:id="@+id/progressbar"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:max="3"
+        android:maxHeight="20dip"
+        android:minHeight="20dip"
+        android:progress="0" 
+        android:background="@android:color/transparent"/>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/provider_list_fragment.xml b/res/layout/provider_list_fragment.xml
index 5a6770c8..70dbae0d 100644
--- a/res/layout/provider_list_fragment.xml
+++ b/res/layout/provider_list_fragment.xml
@@ -1,9 +1,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

-         android:orientation="vertical"

-         android:layout_width="match_parent"

-         android:layout_height="match_parent"

-         android:paddingLeft="8dp"

-         android:paddingRight="8dp">

+    android:layout_width="match_parent"

+    android:layout_height="match_parent"

+    android:orientation="vertical"

+    android:paddingLeft="8dp"

+    android:paddingRight="8dp" >

 

     <ListView

         android:id="@id/android:list"

@@ -12,4 +12,4 @@
         android:layout_weight="1"

         android:drawSelectorOnTop="false" />

 

-</LinearLayout>

+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 91e72a60..ba05b19b 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -222,7 +222,8 @@
     <string name="faq_hint">Be sure to also check out the FAQ. There is a quick start guide.</string>
     <string name="correcttls">Convert remote-tls format from OpenVPN 2.2 to 2.3 format</string>
     <string name="faq_routing_title">Routing/Interface Configuration</string>
-    <string name="faq_routing">The Routing and interface configuration is not done via traditionell ifconfig/route command but by using the VPNService API. This results in a different routing configuration than on other OSes. The configuration only consists of the IP of the tunnel interface and the networks that should be routed over this interface. Especially no peer partner address or gateway address is needed. Special routes to reach the VPN Server (for example added when using redirect-gateway) are not needed either. The application will consequently ignore these settings when importing a configuration. The app ensures with the VPNService API that the connection to the server is not routed through the VPN tunnel. Since only specifing networks to be routed via tunnel is supported extra routes not pointing to the tunnel cannot be supported either. (e.g. route x.x.x.x y.y.y.y net_gateway). The show information button in the log windows show the current configuration of the VPNService network configuration.</string>
+    <string name="faq_routing">The Routing and interface configuration is not done via traditionell ifconfig/route command but by using the VPNService API. This results in a different routing configuration than on other OSes. The configuration only consists of the IP of the tunnel interface and the networks that should be routed over this interface. Especially no peer partner address or gateway address is needed. Special routes to reach the VPN Server (for example added when using redirect-gateway) are not needed either. The application will consequently ignore these settings when importing a configuration. The app ensures with the VPNService API that the connection to the server is not routed through the VPN tunnel. Since only specifing networks to be routed via tunnel is supported extra routes not pointing to the tunnel cannot be supported either. (e.g. route x.x.x.x y.y.y.y net_gateway). The show information button in the log windows show the current configuration of the VPNService network configuration.</
+string>
     <string name="persisttun_summary">Do not fallback to no VPN connection when OpenVPN is reconnecting.</string>
     <string name="persistent_tun_title">Persistent tun</string>
     <string name="translation">Translation</string>
@@ -264,6 +265,8 @@
     <string name="eip_status">Status unknown</string>
     <string name="eip_service_label">Encrypted Internet</string>
     <string name="title_activity_configuration_wizard">Configure Bitmask</string>
+    <string name="provider_list_fragment_tag">Provider list fragment</string>
+    <string name="top_padding">Top padding</string>
     <string name="new_provider_button">Select new Provider</string>
     <string name="introduce_new_provider">Introduce new provider</string>
     <string name="save">Save</string>