diff options
| -rw-r--r-- | AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | res/layout/faq.xml | 5 | ||||
| -rwxr-xr-x | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/fragments/FaqFragment.java | 2 |
4 files changed, 10 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7a96675a..b42cda8c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -33,7 +33,8 @@ android:supportsRtl="true" > <activity android:name=".activities.VPNPreferences" - android:windowSoftInputMode="stateHidden" /> + android:windowSoftInputMode="stateHidden" + android:exported="false"/> <activity android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" diff --git a/res/layout/faq.xml b/res/layout/faq.xml index 9d11e786..8983e203 100644 --- a/res/layout/faq.xml +++ b/res/layout/faq.xml @@ -39,6 +39,11 @@ android:text="@string/faq_system_dialogs" /> <TextView + style="@style/faqitem" + tools:text="@string/faq_system_dialog_xposed" + android:id="@+id/faq_system_dialog_xposed"/> + + <TextView style="@style/faqhead" android:text="@string/faq_duplicate_notification_title" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index e0665d7b..34e13cfe 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -309,4 +309,5 @@ <string name="logview_options">View options</string> <string name="unhandled_exception">Unhandled exception: %1$s\n\n%2$s</string> <string name="unhandled_exception_context">%3$s: %1$s\n\n%2$s</string> + <string name="faq_system_dialog_xposed">If you have rooted your Android device you can install the <a href=\"http://xposed.info/\">Xposed framework</a> and a the <a href=\"http://repo.xposed.info/module/de.blinkt.vpndialogxposed\">VPN Dialog confirm module</a> at your own risk"</string> </resources> diff --git a/src/de/blinkt/openvpn/fragments/FaqFragment.java b/src/de/blinkt/openvpn/fragments/FaqFragment.java index 5f229edb..238ad952 100644 --- a/src/de/blinkt/openvpn/fragments/FaqFragment.java +++ b/src/de/blinkt/openvpn/fragments/FaqFragment.java @@ -22,6 +22,7 @@ public class FaqFragment extends Fragment { insertHtmlEntry(v, R.id.baterry_consumption, R.string.baterry_consumption); insertHtmlEntry(v, R.id.faq_tethering, R.string.faq_tethering); insertHtmlEntry(v, R.id.faq_vpndialog43, R.string.faq_vpndialog43); + insertHtmlEntry(v, R.id.faq_system_dialog_xposed, R.string.faq_system_dialog_xposed); return v; } @@ -29,6 +30,7 @@ public class FaqFragment extends Fragment { TextView faqitem = (TextView) v.findViewById(viewId); faqitem.setText(Html.fromHtml(getActivity().getString(stringId))); faqitem.setMovementMethod(LinkMovementMethod.getInstance()); + } } |