From d6190becb1c48ee912b11a4206116d0fd4c90772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Sat, 20 Dec 2014 20:14:23 +0100
Subject: Update ics-openvpn to 1006

---
 app/src/main/res/layout/log_fragment.xml | 8 +++++---
 app/src/main/res/layout/log_silders.xml  | 2 +-
 app/src/main/res/layout/log_window.xml   | 2 +-
 app/src/main/res/layout/vpnstatus.xml    | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/log_fragment.xml b/app/src/main/res/layout/log_fragment.xml
index 2cc4759e..4fec942e 100644
--- a/app/src/main/res/layout/log_fragment.xml
+++ b/app/src/main/res/layout/log_fragment.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (c) 2012-2014 Arne Schwabe
-  ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -11,19 +11,21 @@
               android:orientation="vertical">
 
     <LinearLayout
+        android:background="@drawable/white_rect"
+        android:elevation="1dp"
             android:layout_height="wrap_content"
             android:layout_width="match_parent">
 
         <include layout="@layout/log_silders"/>
-    </LinearLayout>
 
-    <TextView
+        <TextView
             android:text="@string/speed_waiting"
             android:singleLine="true"
             android:id="@+id/speed"
             tools:ignore="InconsistentLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
+    </LinearLayout>
 
     <ListView
             android:id="@android:id/list"
diff --git a/app/src/main/res/layout/log_silders.xml b/app/src/main/res/layout/log_silders.xml
index 3fcbd85a..152407f9 100644
--- a/app/src/main/res/layout/log_silders.xml
+++ b/app/src/main/res/layout/log_silders.xml
@@ -3,7 +3,7 @@
 
 <!--
   ~ Copyright (c) 2012-2014 Arne Schwabe
-  ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
 
 <LinearLayout
diff --git a/app/src/main/res/layout/log_window.xml b/app/src/main/res/layout/log_window.xml
index d7576ca3..fcc7aa7a 100644
--- a/app/src/main/res/layout/log_window.xml
+++ b/app/src/main/res/layout/log_window.xml
@@ -1,6 +1,6 @@
 <!--
   ~ Copyright (c) 2012-2014 Arne Schwabe
-  ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/vpnstatus.xml b/app/src/main/res/layout/vpnstatus.xml
index 2fd65b4c..2d77bbab 100644
--- a/app/src/main/res/layout/vpnstatus.xml
+++ b/app/src/main/res/layout/vpnstatus.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (c) 2012-2014 Arne Schwabe
-  ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
 
 <merge xmlns:tools="http://schemas.android.com/tools"
-- 
cgit v1.2.3


From 6ed3fde3ea171700390552dd1040e10e8cc1ca32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 12 Jan 2015 19:00:01 +0100
Subject: xlarge layouts updated

Last refactor, introducing ButterKnife and all those things, I forgot to
update this layouts.
---
 app/src/main/res/layout/configuration_wizard_activity.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/configuration_wizard_activity.xml b/app/src/main/res/layout/configuration_wizard_activity.xml
index a5bca1e9..71cd5314 100644
--- a/app/src/main/res/layout/configuration_wizard_activity.xml
+++ b/app/src/main/res/layout/configuration_wizard_activity.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     tools:context=".ConfigurationWizard" >
 
-    <ListView
+  <ListView
         android:id="@+id/provider_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -28,4 +28,4 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:layout_centerHorizontal="true"
         android:textColor="@android:color/holo_blue_bright" />
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
-- 
cgit v1.2.3


From 250b56762857f2e52626236d3716459786ce126d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 15 Jan 2015 15:24:52 +0100
Subject: More tests, sometimes they don't pass sometimes do

testIsValid depends on the speed of Runtime's exec: sometimes it's quick
and passes (because it changes the date correctly) and sometimes is
not. A waitFor doesn't fix the issue, it waits forever.
---
 app/src/main/res/layout/provider_detail_fragment.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/provider_detail_fragment.xml b/app/src/main/res/layout/provider_detail_fragment.xml
index eb90fad9..3b35bae7 100644
--- a/app/src/main/res/layout/provider_detail_fragment.xml
+++ b/app/src/main/res/layout/provider_detail_fragment.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/provider_detail_fragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
-- 
cgit v1.2.3