diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-23 20:09:25 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-23 20:09:25 +0100 |
| commit | 44b59b984f76da62d409b585047224cb1e958016 (patch) | |
| tree | 1a8d7f85690ce56196855fa969e86b1e53d813f3 /app/src/main/res/layout | |
| parent | b3f0c7b3111efc1066423925b02a9edf9e15eaa7 (diff) | |
| parent | d6190becb1c48ee912b11a4206116d0fd4c90772 (diff) | |
Merge branch 'bug/Try-different-ports-to-connect-to-the-openvpn-server-#6560' into develop
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/log_fragment.xml | 8 | ||||
| -rw-r--r-- | app/src/main/res/layout/log_silders.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/log_window.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/vpnstatus.xml | 2 |
4 files changed, 8 insertions, 6 deletions
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" |