5 files changed, 120 insertions, 0 deletions
diff --git a/main/src/ui/res/layout-v21/connection_fab.xml b/main/src/ui/res/layout-v21/connection_fab.xml
new file mode 100644
index 00000000..e3e620d6
--- /dev/null
+++ b/main/src/ui/res/layout-v21/connection_fab.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<!--
+  ~ Copyright (c) 2012-2016 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="InconsistentLayout"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/add_new_remote"
+    android:layout_width="@dimen/round_button_diameter"
+    android:layout_height="@dimen/round_button_diameter"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentEnd="true"
+    android:layout_marginBottom="16dp"
+    android:layout_marginEnd="16dp"
+    android:background="@drawable/oval_ripple"
+    android:elevation="1dp"
+    android:src="@android:drawable/ic_input_add"
+    android:stateListAnimator="@anim/fab_anim"
+    android:tint="@android:color/white"
+ />
+\ No newline at end of file
diff --git a/main/src/ui/res/layout-v21/profile_list_fabs.xml b/main/src/ui/res/layout-v21/profile_list_fabs.xml
new file mode 100644
index 00000000..4fe403b6
--- /dev/null
+++ b/main/src/ui/res/layout-v21/profile_list_fabs.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2012-2016 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="InconsistentLayout">
+
+    <ImageButton
+        android:id="@+id/fab_import"
+        android:layout_width="@dimen/round_button_diameter"
+        android:layout_height="@dimen/round_button_diameter"
+        android:layout_gravity="end|bottom"
+        android:tint="@android:color/white"
+        android:background="@drawable/oval_ripple"
+        android:elevation="@dimen/elevation_low"
+        android:layout_marginBottom="@dimen/add_button_margin_topfab"
+        android:layout_marginEnd="@dimen/add_button_margin"
+        android:src="@drawable/ic_archive_grey600_24dp"
+        android:contentDescription="@string/import_config" />
+
+    <ImageButton
+        android:contentDescription="@string/add_profile"
+        android:id="@+id/fab_add"
+        android:layout_width="@dimen/round_button_diameter"
+        android:layout_height="@dimen/round_button_diameter"
+        android:layout_gravity="end|bottom"
+        android:tint="@android:color/white"
+        android:background="@drawable/oval_ripple"
+        android:elevation="@dimen/elevation_low"
+        android:layout_marginBottom="@dimen/add_button_margin"
+        android:layout_marginEnd="@dimen/add_button_margin"
+        android:src="@android:drawable/ic_input_add" />
+
+</merge>
+\ No newline at end of file
diff --git a/main/src/ui/res/layout-v21/save_fab.xml b/main/src/ui/res/layout-v21/save_fab.xml
new file mode 100644
index 00000000..af7847e8
--- /dev/null
+++ b/main/src/ui/res/layout-v21/save_fab.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <!--
+      ~ Copyright (c) 2012-2015 Arne Schwabe
+      ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+      -->
+
+<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="InconsistentLayout"
+    android:id="@+id/fab_save"
+    android:layout_width="@dimen/round_button_diameter"
+    android:layout_height="@dimen/round_button_diameter"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentEnd="true"
+    android:layout_marginBottom="16dp"
+    android:layout_marginEnd="16dp"
+    android:background="@drawable/oval_ripple"
+    android:elevation="1dp"
+    android:src="@android:drawable/ic_menu_save"
+    android:stateListAnimator="@anim/fab_anim"
+    android:tint="@android:color/white" />
+    <!--tools:showIn="@layout/config_converter" -->
diff --git a/main/src/ui/res/layout-v21/share_fab.xml b/main/src/ui/res/layout-v21/share_fab.xml
new file mode 100644
index 00000000..fb0d432f
--- /dev/null
+++ b/main/src/ui/res/layout-v21/share_fab.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2012-2016 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="InconsistentLayout"
+    android:id="@+id/share_config"
+    android:layout_width="@dimen/round_button_diameter"
+    android:layout_height="@dimen/round_button_diameter"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentRight="true"
+    android:layout_marginBottom="16dp"
+    android:layout_marginRight="16dp"
+    android:background="@drawable/oval_ripple"
+    android:elevation="1dp"
+    android:src="@drawable/ic_menu_share"
+    android:stateListAnimator="@anim/fab_anim"
+    android:tint="@android:color/white"
+    />
+\ No newline at end of file
diff --git a/main/src/ui/res/layout-v21/tabs.xml b/main/src/ui/res/layout-v21/tabs.xml
new file mode 100644
index 00000000..af349a4f
--- /dev/null
+++ b/main/src/ui/res/layout-v21/tabs.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2012-2016 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+<merge xmlns:blinkt="http://schemas.android.com/apk/res-auto">
+
+    <de.blinkt.openvpn.views.PagerSlidingTabStrip xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/sliding_tabs"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/actionBarSize"
+        android:background="@drawable/bg_tabs"
+        blinkt:pstsIndicatorColor="@color/accent"
+        blinkt:pstsIndicatorHeight="3dp"
+        android:elevation="8dp" />
+</merge>
+\ No newline at end of file