]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
android: Background for state panels provides separator
authorTobias Brunner <tobias@strongswan.org>
Thu, 30 May 2013 08:50:08 +0000 (10:50 +0200)
committerTobias Brunner <tobias@strongswan.org>
Mon, 8 Jul 2013 16:49:29 +0000 (18:49 +0200)
src/frontends/android/res/drawable/state_background.xml [moved from src/frontends/android/res/drawable/vpn_state_background.xml with 60% similarity]
src/frontends/android/res/layout/imc_state_fragment.xml
src/frontends/android/res/layout/vpn_state_fragment.xml
src/frontends/android/res/values/colors.xml

similarity index 60%
rename from src/frontends/android/res/drawable/vpn_state_background.xml
rename to src/frontends/android/res/drawable/state_background.xml
index 24f469add5c3dd298a295282e7f58426f1902cba..ee36325cceb4eb2fead0b234fc0f778d7a18e503 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2012 Tobias Brunner
+    Copyright (C) 2012-2013 Tobias Brunner
     Hochschule fuer Technik Rapperswil
 
     This program is free software; you can redistribute it and/or modify it
     or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
     for more details.
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid
-        android:color="#333" />
+    <item>
+        <shape>
+            <solid
+                android:color="@color/panel_separator" />
+        </shape>
+    </item>
 
-</shape>
\ No newline at end of file
+    <item android:bottom="2dp">
+        <shape>
+            <solid
+                android:color="@color/panel_background" />
+        </shape>
+    </item>
+
+</layer-list>
index bdb3cd37da15c48a6197346439c19fe3781426a5..86853889a272704bbeefbe502c9e77d8dfb79a3f 100644 (file)
@@ -16,7 +16,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/vpn_state_background"
+    android:paddingBottom="2dp"
+    android:background="@drawable/state_background"
     android:orientation="vertical" >
 
     <LinearLayout
@@ -46,9 +47,4 @@
 
     </LinearLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:background="?android:attr/listDivider" />
-
 </LinearLayout>
index 6353f3289701ad5a8c28d2883bd67a3bf4840747..e347c4c4ba673bbbbb76c8184afe1e5ba26d4fa0 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2012 Tobias Brunner
+    Copyright (C) 2012-2013 Tobias Brunner
     Copyright (C) 2012 Giuliano Grassi
     Copyright (C) 2012 Ralf Sager
     Hochschule fuer Technik Rapperswil
@@ -18,8 +18,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="5dp"
-    android:background="@drawable/vpn_state_background"
+    android:paddingBottom="2dp"
+    android:background="@drawable/state_background"
     android:orientation="vertical" >
 
     <GridLayout
@@ -83,9 +83,4 @@
         style="?android:attr/borderlessButtonStyle" >
     </Button>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:background="?android:attr/listDivider" />
-
 </LinearLayout>
index ee8d72461933764c313d7c157c791cf1bc96b544..4af28b4d49c9834b59b6e0de38126d8500e99fce 100644 (file)
     <color
         name="success_text">#99CC00</color>
 
+    <color
+        name="panel_background">#333333</color>
+
+    <color
+        name="panel_separator">#5a5a5a</color>
+
 </resources>