diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-04-30 19:11:24 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-04-30 19:11:24 +0200 |
| commit | f1352bae221176125b52f60761cd4651c8c3f4da (patch) | |
| tree | 8ed4644d1a08fa1b6123601448fd9e247d46afdf | |
| parent | 70befaa639c15637620d0cefc145f31bd835dfed (diff) | |
| parent | 291769bfb2d80b347990b59f5d82353913238139 (diff) | |
Merge with 6c6a37158f6bbfbd84fc9d20abca7480b50544aa
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | res/xml/vpn_obscure.xml | 1 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/Settings_Obscure.java | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5c779f5e..7b600181 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,8 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.blinkt.openvpn" - android:versionCode="12" - android:versionName="0.4.4" > + android:versionCode="13" + android:versionName="0.4.5" > <uses-permission android:name="android.permission.INTERNET" /> diff --git a/res/xml/vpn_obscure.xml b/res/xml/vpn_obscure.xml index 718f1920..6c7d4983 100644 --- a/res/xml/vpn_obscure.xml +++ b/res/xml/vpn_obscure.xml @@ -7,7 +7,6 @@ android:entryValues="@array/verb_values" android:key="verblevel" android:persistent="false" - android:summary="%s" android:title="Log verbosity level" /> <CheckBoxPreference diff --git a/src/de/blinkt/openvpn/Settings_Obscure.java b/src/de/blinkt/openvpn/Settings_Obscure.java index 55615917..02a433fb 100644 --- a/src/de/blinkt/openvpn/Settings_Obscure.java +++ b/src/de/blinkt/openvpn/Settings_Obscure.java @@ -33,6 +33,7 @@ public class Settings_Obscure extends PreferenceFragment implements OnPreference mLogverbosity = (ListPreference) findPreference("verblevel"); mLogverbosity.setOnPreferenceChangeListener(this); + mLogverbosity.setSummary("%s"); loadSettings(); |