summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-04-30 02:53:12 +0200
committerArne Schwabe <arne@rfc2549.org>2012-04-30 02:53:12 +0200
commit44fa929579f9d801de9b62269f80310f3405ba4a (patch)
tree2ec9d7e96aea032153e51aa1ec9df4ce23d9ad10 /res
parent59ec3d3da5b3a7dca678df9adde663a57ccd1632 (diff)
version 0.4.2
--HG-- rename : src/de/blinkt/openvpn/BasicSettings.java => src/de/blinkt/openvpn/Settings_Basic.java
Diffstat (limited to 'res')
-rw-r--r--res/layout/basic_settings.xml4
-rw-r--r--res/menu/logmenu.xml9
-rw-r--r--res/xml/vpn_headers.xml2
3 files changed, 13 insertions, 2 deletions
diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml
index 37d2c733..e19ec148 100644
--- a/res/layout/basic_settings.xml
+++ b/res/layout/basic_settings.xml
@@ -167,6 +167,8 @@
style="@style/item"
android:layout_marginLeft="8dip"
android:layout_marginRight="8dip"
+ android:hint="@string/pw_query_hint"
+
android:inputType="textPassword" />
</LinearLayout>
@@ -203,8 +205,8 @@
style="@style/item"
android:layout_marginLeft="8dip"
android:layout_marginRight="8dip"
+ android:hint="@string/pw_query_hint"
android:inputType="textPassword" />
- <!-- android:hint="@string/pw_query_hint" -->
</LinearLayout>
<LinearLayout
diff --git a/res/menu/logmenu.xml b/res/menu/logmenu.xml
new file mode 100644
index 00000000..f97418a1
--- /dev/null
+++ b/res/menu/logmenu.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<item android:id="@+id/clearlog"
+ android:icon="@android:drawable/ic_delete"
+ android:title="clear log"
+ android:showAsAction="ifRoom"
+ />
+
+</menu> \ No newline at end of file
diff --git a/res/xml/vpn_headers.xml b/res/xml/vpn_headers.xml
index faaa6cdd..dd942832 100644
--- a/res/xml/vpn_headers.xml
+++ b/res/xml/vpn_headers.xml
@@ -3,7 +3,7 @@
<header
android:tag="BasicSettings"
- android:fragment="de.blinkt.openvpn.BasicSettings"
+ android:fragment="de.blinkt.openvpn.Settings_Basic"
android:summary="Server, port and authentication method. Normally you should only settings specified here."
android:title="Basic Settings"
android:id="@+id/basicsettingsid"/>