diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-11-07 22:40:51 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2013-11-07 22:40:51 +0100 |
| commit | 8ced9f378613425efb9949196e967dbe2f03a63a (patch) | |
| tree | 37eb4395b3d04463f63916b1cdb7498bf6ebb828 /res/layout | |
| parent | e66b35409cff37433af11693673145406029356f (diff) | |
Fine tune log window.
--HG--
rename : res/layout-w720dp/log_fragment.xml => res/layout-sw600dp/log_fragment.xml
rename : res/values-w600dp/dimens.xml => res/values-sw600dp/dimens.xml
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/log_fragment.xml | 7 | ||||
| -rw-r--r-- | res/layout/log_silders.xml | 2 | ||||
| -rw-r--r-- | res/layout/vpnstatus.xml | 46 |
3 files changed, 53 insertions, 2 deletions
diff --git a/res/layout/log_fragment.xml b/res/layout/log_fragment.xml index d1e467b1..bcc3f9af 100644 --- a/res/layout/log_fragment.xml +++ b/res/layout/log_fragment.xml @@ -5,7 +5,12 @@ android:layout_height="match_parent" android:orientation="vertical"> - <include layout="@layout/log_silders"/> + <LinearLayout + android:layout_height="wrap_content" + android:layout_width="match_parent"> + + <include layout="@layout/log_silders"/> + </LinearLayout> <TextView android:text="@string/speed_waiting" diff --git a/res/layout/log_silders.xml b/res/layout/log_silders.xml index 9aadd4d1..5df97490 100644 --- a/res/layout/log_silders.xml +++ b/res/layout/log_silders.xml @@ -8,7 +8,7 @@ android:id="@+id/logOptionsLayout" android:visibility="gone" tools:visibility="visible" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content"> <TextView diff --git a/res/layout/vpnstatus.xml b/res/layout/vpnstatus.xml new file mode 100644 index 00000000..0c765fe6 --- /dev/null +++ b/res/layout/vpnstatus.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:tools="http://schemas.android.com/tools" + xmlns:android="http://schemas.android.com/apk/res/android"> + + <Space + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + + + <TextView + android:text="Upload" + style="@style/logWindowStatusTitle"/> + + <TextView + style="@style/logWindowStatusText" + android:id="@+id/speedUp" + tools:text="4 Mbit/s 6.7 GB"/> + + <TextView + android:text="Download" + style="@style/logWindowStatusTitle"/> + + <TextView + style="@style/logWindowStatusText" + android:id="@+id/speedDown" + tools:text="2 Mbit/s 4.7 GB"/> + + + <Space + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + + + <TextView + android:text="Vpn Status" + style="@style/logWindowStatusTitle"/> + + <TextView + android:id="@+id/speedStatus" + tools:text="Connected" + style="@style/logWindowStatusText"/> + + +</merge>
\ No newline at end of file |