summaryrefslogtreecommitdiff
path: root/main/src
diff options
context:
space:
mode:
Diffstat (limited to 'main/src')
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java6
-rw-r--r--main/src/main/res/layout/file_dialog_row.xml18
-rw-r--r--main/src/main/res/layout/server_card.xml7
-rwxr-xr-xmain/src/main/res/values/strings.xml3
4 files changed, 19 insertions, 15 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java
index d02dfd47..a1635d54 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java
@@ -56,9 +56,9 @@ public class Settings_Allowed_Apps extends Fragment implements AdapterView.OnIte
//public TextView disabled;
public CompoundButton checkBox;
- static public AppViewHolder createOrRecycle(LayoutInflater inflater, View convertView) {
+ static public AppViewHolder createOrRecycle(LayoutInflater inflater, View convertView, ViewGroup parent) {
if (convertView == null) {
- convertView = inflater.inflate(R.layout.allowed_application_layout, null);
+ convertView = inflater.inflate(R.layout.allowed_application_layout, parent, false);
// Creates a ViewHolder and store references to the two children views
// we want to bind data to.
@@ -151,7 +151,7 @@ public class Settings_Allowed_Apps extends Fragment implements AdapterView.OnIte
@Override
public View getView(int position, View convertView, ViewGroup parent) {
- AppViewHolder viewHolder = AppViewHolder.createOrRecycle(mInflater, convertView);
+ AppViewHolder viewHolder = AppViewHolder.createOrRecycle(mInflater, convertView ,parent);
convertView = viewHolder.rootView;
viewHolder.mInfo = mPackages.get(position);
final ApplicationInfo mInfo = mPackages.get(position);
diff --git a/main/src/main/res/layout/file_dialog_row.xml b/main/src/main/res/layout/file_dialog_row.xml
index 584b26c3..bca67776 100644
--- a/main/src/main/res/layout/file_dialog_row.xml
+++ b/main/src/main/res/layout/file_dialog_row.xml
@@ -4,15 +4,17 @@
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent" >
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="wrap_content"
+ android:orientation="horizontal"
+ android:layout_height="wrap_content">
<ImageView
android:id="@+id/fdrowimage"
android:layout_width="wrap_content"
android:layout_height="35dp"
- android:layout_alignParentLeft="true"
+ tools:background="@drawable/ic_root_folder_am"
android:paddingLeft="3dp"
android:paddingRight="5dp" android:contentDescription="@string/file_icon"/>
@@ -20,12 +22,10 @@
android:id="@+id/fdrowtext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignBottom="@+id/fdrowimage"
- android:layout_alignTop="@+id/fdrowimage"
- android:layout_toRightOf="@+id/fdrowimage"
android:gravity="center_vertical"
- android:text="@+id/fdrowtext"
+ android:layout_gravity="center_vertical"
+ tools:text="foo, die datei,"
android:textAppearance="?android:attr/textAppearanceMedium" />
-</RelativeLayout> \ No newline at end of file
+</LinearLayout> \ No newline at end of file
diff --git a/main/src/main/res/layout/server_card.xml b/main/src/main/res/layout/server_card.xml
index 1f59a99f..690a27bd 100644
--- a/main/src/main/res/layout/server_card.xml
+++ b/main/src/main/res/layout/server_card.xml
@@ -153,7 +153,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/udptcpradiogroup"
android:id="@+id/use_customoptions"
- android:text="Custom Options" />
+ android:text="@string/custom_connection_options" />
<LinearLayout
android:paddingLeft="10dp"
@@ -165,7 +165,7 @@
android:layout_height="wrap_content">
<TextView
android:id="@+id/warnung_custom"
- android:text="Specify custom connection specific options. Use with care"
+ android:text="@string/custom_connection_options_warng"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -195,7 +195,8 @@
android:layout_alignEnd="@+id/portnumber"
android:layout_below="@id/remoteSwitch"
android:background="@drawable/ic_menu_delete_grey"
- android:id="@+id/remove_connection" />
+ android:id="@+id/remove_connection"
+ android:contentDescription="@string/remove_connection_entry" />
</RelativeLayout>
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
index a223ed04..2a694da1 100755
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -369,5 +369,8 @@
<string name="ab_not_route_to_vpn_title">Route to the configured IP address</string>
<string name="ab_kitkat_mss_title">Wrong MSS value for VPN connection</string>
<string name="ab_secondary_users_title">Secondary tablet users</string>
+ <string name="custom_connection_options_warng">Specify custom connection specific options. Use with care</string>
+ <string name="custom_connection_options">Custom Options</string>
+ <string name="remove_connection_entry">Remove connection entry</string>
</resources>