From cfb44a7b338a0c16db4e6d3d28168757ca53386a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 1 Aug 2013 09:36:01 +0200
Subject: Two action items: login/logout and settings.

---
 res/drawable-hdpi/ic_menu_login.png                | Bin 0 -> 1656 bytes
 res/drawable-hdpi/ic_menu_settings_holo_light.png  | Bin 0 -> 1227 bytes
 res/drawable-ldpi/ic_menu_login.png                | Bin 0 -> 1512 bytes
 res/drawable-mdpi/ic_menu_login.png                | Bin 0 -> 1114 bytes
 res/drawable-mdpi/ic_menu_settings_holo_light.png  | Bin 0 -> 866 bytes
 res/drawable-xhdpi/ic_menu_login.png               | Bin 0 -> 2178 bytes
 res/drawable-xhdpi/ic_menu_settings_holo_light.png | Bin 0 -> 1622 bytes
 res/menu/client_dashboard.xml                      |  33 +++++++++++++++++----
 8 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_menu_login.png
 create mode 100644 res/drawable-hdpi/ic_menu_settings_holo_light.png
 create mode 100644 res/drawable-ldpi/ic_menu_login.png
 create mode 100644 res/drawable-mdpi/ic_menu_login.png
 create mode 100644 res/drawable-mdpi/ic_menu_settings_holo_light.png
 create mode 100644 res/drawable-xhdpi/ic_menu_login.png
 create mode 100644 res/drawable-xhdpi/ic_menu_settings_holo_light.png

(limited to 'res')

diff --git a/res/drawable-hdpi/ic_menu_login.png b/res/drawable-hdpi/ic_menu_login.png
new file mode 100644
index 00000000..afa152b2
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_login.png differ
diff --git a/res/drawable-hdpi/ic_menu_settings_holo_light.png b/res/drawable-hdpi/ic_menu_settings_holo_light.png
new file mode 100644
index 00000000..577e0558
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_settings_holo_light.png differ
diff --git a/res/drawable-ldpi/ic_menu_login.png b/res/drawable-ldpi/ic_menu_login.png
new file mode 100644
index 00000000..d4181de5
Binary files /dev/null and b/res/drawable-ldpi/ic_menu_login.png differ
diff --git a/res/drawable-mdpi/ic_menu_login.png b/res/drawable-mdpi/ic_menu_login.png
new file mode 100644
index 00000000..122ba33b
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_login.png differ
diff --git a/res/drawable-mdpi/ic_menu_settings_holo_light.png b/res/drawable-mdpi/ic_menu_settings_holo_light.png
new file mode 100644
index 00000000..f32a37e4
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_settings_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_login.png b/res/drawable-xhdpi/ic_menu_login.png
new file mode 100644
index 00000000..5095ed97
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_login.png differ
diff --git a/res/drawable-xhdpi/ic_menu_settings_holo_light.png b/res/drawable-xhdpi/ic_menu_settings_holo_light.png
new file mode 100644
index 00000000..aa33c388
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_settings_holo_light.png differ
diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml
index 55ad91b4..2ce8b87c 100644
--- a/res/menu/client_dashboard.xml
+++ b/res/menu/client_dashboard.xml
@@ -3,12 +3,33 @@
     <item
         android:id="@+id/menu_settings"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_menu_settings_holo_light"
         android:title="@string/menu_settings"/>
-    <item android:id="@+id/about_leap" android:title="@string/about" android:orderInCategory="110" />
-    <item android:id="@+id/legacy_interface" android:title="ICS OpenVPN Interface" android:orderInCategory="500" />
-    <item android:id="@+id/switch_provider" android:title="@string/switch_provider_menu_option" android:orderInCategory="501"/>
-    <item android:id="@+id/login_button" android:title="@string/login_button" android:visible="false"></item>
-    <item android:id="@+id/logout_button" android:title="@string/logout_button" android:visible="false"></item>
+    <item
+        android:id="@+id/about_leap"
+        android:orderInCategory="110"
+        android:title="@string/about"/>
+    <item
+        android:id="@+id/legacy_interface"
+        android:orderInCategory="500"
+        android:title="ICS OpenVPN Interface"/>
+    <item
+        android:id="@+id/switch_provider"
+        android:orderInCategory="501"
+        android:title="@string/switch_provider_menu_option"/>
+    <item
+        android:id="@+id/login_button"
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_menu_login"
+        android:title="@string/login_button"
+        android:visible="false">
+    </item>
+    <item
+        android:id="@+id/logout_button"
+        android:showAsAction="ifRoom"
+        android:title="@string/logout_button"
+        android:visible="false">
+    </item>
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3