summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2015-06-07 22:03:10 +0100
committerArne Schwabe <arne@rfc2549.org>2015-06-07 22:03:10 +0100
commit4ccdfbc15ad7bea4ce3c47d00e8c8bcbc79cba42 (patch)
treec1383057319ad8d7ca080597e90749df289c3514
parentb95bd6fe2589e53e4a4c7b3746dcb6005bd0e1c0 (diff)
Update sdks to 22, Remove FAB again, layout/placement needs more thought.
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java3
-rw-r--r--main/src/main/res/layout/config_converter.xml2
-rw-r--r--main/src/main/res/layout/vpn_profile_list.xml2
3 files changed, 3 insertions, 4 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java b/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
index 9d19a0e8..82de0fbc 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
@@ -312,8 +312,7 @@ public class VpnStatus {
public void saveLogToDisk(Context c) {
- new File(c.getCacheDir(), "log.xml");
-
+ File logOut = new File(c.getCacheDir(), "log.xml");
}
diff --git a/main/src/main/res/layout/config_converter.xml b/main/src/main/res/layout/config_converter.xml
index fe4ca31f..e93f2731 100644
--- a/main/src/main/res/layout/config_converter.xml
+++ b/main/src/main/res/layout/config_converter.xml
@@ -46,5 +46,5 @@
</LinearLayout>
</ScrollView>
- <include layout="@layout/save_fab" />
+ <!-- <include layout="@layout/save_fab" /> -->
</FrameLayout>
diff --git a/main/src/main/res/layout/vpn_profile_list.xml b/main/src/main/res/layout/vpn_profile_list.xml
index 3f295f2d..b93b62ea 100644
--- a/main/src/main/res/layout/vpn_profile_list.xml
+++ b/main/src/main/res/layout/vpn_profile_list.xml
@@ -74,6 +74,6 @@
</LinearLayout>
- <include layout="@layout/profile_list_fabs" />
+ <!-- <include layout="@layout/profile_list_fabs" /> -->
</FrameLayout>