summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-08-01 09:36:01 +0200
committerParménides GV <parmegv@sdf.org>2013-10-04 10:39:13 +0200
commitcfb44a7b338a0c16db4e6d3d28168757ca53386a (patch)
tree986d132329a3b657a969efeae50689a6e6e51474
parent04fedee9f6be1e3e46a8c91c9a39343513cc6fe1 (diff)
Two action items: login/logout and settings.
-rw-r--r--res/drawable-hdpi/ic_menu_login.pngbin0 -> 1656 bytes
-rw-r--r--res/drawable-hdpi/ic_menu_settings_holo_light.pngbin0 -> 1227 bytes
-rw-r--r--res/drawable-ldpi/ic_menu_login.pngbin0 -> 1512 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_login.pngbin0 -> 1114 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_settings_holo_light.pngbin0 -> 866 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_login.pngbin0 -> 2178 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_settings_holo_light.pngbin0 -> 1622 bytes
-rw-r--r--res/menu/client_dashboard.xml33
8 files changed, 27 insertions, 6 deletions
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
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_login.png
Binary files 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
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_settings_holo_light.png
Binary files 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
--- /dev/null
+++ b/res/drawable-ldpi/ic_menu_login.png
Binary files 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
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_login.png
Binary files 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
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_settings_holo_light.png
Binary files 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
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_login.png
Binary files 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
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_settings_holo_light.png
Binary files 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