summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout-sw600dp/log_fragment.xml41
-rw-r--r--res/layout/about.xml2
-rw-r--r--res/layout/api_confirm.xml10
-rw-r--r--res/layout/file_dialog.xml1
-rw-r--r--res/layout/log_fragment.xml1
5 files changed, 27 insertions, 28 deletions
diff --git a/res/layout-sw600dp/log_fragment.xml b/res/layout-sw600dp/log_fragment.xml
index d8e8562f..c4e1355c 100644
--- a/res/layout-sw600dp/log_fragment.xml
+++ b/res/layout-sw600dp/log_fragment.xml
@@ -3,35 +3,30 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
+ android:orientation="horizontal"
+ android:padding="20dp"
tools:context=".LogWindow">
+
<LinearLayout
- android:padding="20dp"
+ android:minWidth="300dp"
+ android:orientation="vertical"
android:layout_width="wrap_content"
- android:orientation="horizontal"
android:layout_height="match_parent">
- <LinearLayout
- android:minWidth="300dp"
- android:orientation="vertical"
- android:layout_width="wrap_content"
- android:layout_height="match_parent">
-
- <include layout="@layout/log_silders"/>
+ <include layout="@layout/log_silders"/>
- <include layout="@layout/vpnstatus"/>
- </LinearLayout>
+ <include layout="@layout/vpnstatus"/>
+ </LinearLayout>
- <Space
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:minWidth="5dp"/>
+ <Space
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:minWidth="5dp"/>
- <ListView
- android:id="@android:id/list"
- android:transcriptMode="normal"
- android:layout_width="fill_parent"
- android:layout_height="match_parent"/>
- </LinearLayout>
-</LinearLayout> \ No newline at end of file
+ <ListView
+ android:id="@android:id/list"
+ android:transcriptMode="normal"
+ android:layout_width="fill_parent"
+ android:layout_height="match_parent"/>
+</LinearLayout>
diff --git a/res/layout/about.xml b/res/layout/about.xml
index 61343517..afe1f6ba 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -178,7 +178,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="Full licenses"
+ android:text="@string/full_licenses"
android:textAppearance="?android:attr/textAppearanceLarge" />
<WebView
diff --git a/res/layout/api_confirm.xml b/res/layout/api_confirm.xml
index afec0df8..28624880 100644
--- a/res/layout/api_confirm.xml
+++ b/res/layout/api_confirm.xml
@@ -16,23 +16,25 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="3mm">
+ android:padding="20dp">
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
+ tools:ignore="UseCompoundDrawables"
android:gravity="center_vertical">
<ImageView android:id="@+id/icon"
android:contentDescription="@string/permission_icon_app"
android:layout_width="@android:dimen/app_icon_size"
android:layout_height="@android:dimen/app_icon_size"
- android:paddingRight="1mm"/>
+ android:paddingRight="5dp"/>
<TextView android:id="@+id/prompt"
android:layout_width="fill_parent"
@@ -43,8 +45,8 @@
<TextView android:id="@+id/warning"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:paddingTop="1mm"
- android:paddingBottom="1mm"
+ android:paddingTop="5dp"
+ android:paddingBottom="5dp"
android:text="@string/remote_warning"
android:textSize="18sp"/>
diff --git a/res/layout/file_dialog.xml b/res/layout/file_dialog.xml
index 8e07ce31..12abe497 100644
--- a/res/layout/file_dialog.xml
+++ b/res/layout/file_dialog.xml
@@ -6,6 +6,7 @@
<LinearLayout
android:id="@+id/fragment_place"
+ android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
</LinearLayout>
diff --git a/res/layout/log_fragment.xml b/res/layout/log_fragment.xml
index bcc3f9af..0b428070 100644
--- a/res/layout/log_fragment.xml
+++ b/res/layout/log_fragment.xml
@@ -16,6 +16,7 @@
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"/>