diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-12-11 10:18:06 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2013-12-11 10:18:06 +0100 |
| commit | 49653f7c3811a29afc92b3def7430e962a39fe0b (patch) | |
| tree | 74460916357ae9f0dd1849290d29881f3a4f423b /res | |
| parent | ce1dba9a001049264449eadd138a9b1d93eccba3 (diff) | |
Move activities and views into packages
--HG--
rename : src/de/blinkt/openvpn/ConfigConverter.java => src/de/blinkt/openvpn/activities/ConfigConverter.java
rename : src/de/blinkt/openvpn/app/CreateShortcuts.java => src/de/blinkt/openvpn/activities/CreateShortcuts.java
rename : src/de/blinkt/openvpn/DisconnectVPN.java => src/de/blinkt/openvpn/activities/DisconnectVPN.java
rename : src/de/blinkt/openvpn/FileSelect.java => src/de/blinkt/openvpn/activities/FileSelect.java
rename : src/de/blinkt/openvpn/LogWindow.java => src/de/blinkt/openvpn/activities/LogWindow.java
rename : src/de/blinkt/openvpn/MainActivity.java => src/de/blinkt/openvpn/activities/MainActivity.java
rename : src/de/blinkt/openvpn/FileSelectLayout.java => src/de/blinkt/openvpn/views/FileSelectLayout.java
rename : src/de/blinkt/openvpn/RemoteCNPreference.java => src/de/blinkt/openvpn/views/RemoteCNPreference.java
rename : src/de/blinkt/openvpn/fragments/SeekBarTicks.java => src/de/blinkt/openvpn/views/SeekBarTicks.java
extra : rebase_source : fccff1bc269dbc0ae33b96a4947b8a6e2924efeb
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/basic_settings.xml | 8 | ||||
| -rw-r--r-- | res/layout/log_silders.xml | 2 | ||||
| -rw-r--r-- | res/xml/vpn_authentification.xml | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml index 25175876..550a21c5 100644 --- a/res/layout/basic_settings.xml +++ b/res/layout/basic_settings.xml @@ -107,7 +107,7 @@ android:orientation="vertical" android:visibility="gone" > - <de.blinkt.openvpn.FileSelectLayout + <de.blinkt.openvpn.views.FileSelectLayout android:id="@+id/caselect" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -121,13 +121,13 @@ android:orientation="vertical" android:visibility="gone" > - <de.blinkt.openvpn.FileSelectLayout + <de.blinkt.openvpn.views.FileSelectLayout android:id="@+id/certselect" android:layout_width="match_parent" android:layout_height="wrap_content" blinkt:title="@string/client_certificate_title" /> - <de.blinkt.openvpn.FileSelectLayout + <de.blinkt.openvpn.views.FileSelectLayout android:id="@+id/keyselect" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -165,7 +165,7 @@ android:orientation="vertical" android:visibility="gone" > - <de.blinkt.openvpn.FileSelectLayout + <de.blinkt.openvpn.views.FileSelectLayout android:id="@+id/pkcs12select" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/res/layout/log_silders.xml b/res/layout/log_silders.xml index 1035cb4a..0ecb5daa 100644 --- a/res/layout/log_silders.xml +++ b/res/layout/log_silders.xml @@ -17,7 +17,7 @@ android:text="@string/log_verbosity_level"/> - <de.blinkt.openvpn.fragments.SeekBarTicks + <de.blinkt.openvpn.views.SeekBarTicks android:id="@+id/LogLevelSlider" android:layout_width="300dp" android:layout_height="wrap_content" diff --git a/res/xml/vpn_authentification.xml b/res/xml/vpn_authentification.xml index 727cae40..15a260c2 100644 --- a/res/xml/vpn_authentification.xml +++ b/res/xml/vpn_authentification.xml @@ -10,7 +10,7 @@ android:summary="@string/remote_tlscn_check_summary" android:title="@string/remote_tlscn_check_title" /> - <de.blinkt.openvpn.RemoteCNPreference + <de.blinkt.openvpn.views.RemoteCNPreference android:dependency="checkRemoteCN" android:key="remotecn" android:title="@string/enter_tlscn_title" /> |