From bce7885ce6124d9b9738fcbe35ed475ed698ff46 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Thu, 28 Feb 2013 23:42:07 +0100
Subject: Menu fine tuning

---
 AndroidManifest.xml                       |  14 +++++++++-----
 res/drawable-hdpi/ic_clock.png            | Bin 0 -> 1691 bytes
 res/drawable-mdpi/ic_clock.png            | Bin 0 -> 1114 bytes
 res/drawable-xhdpi/ic_clock.png           | Bin 0 -> 2372 bytes
 res/menu/logmenu.xml                      |   2 +-
 src/de/blinkt/openvpn/VPNProfileList.java |   8 ++++----
 todo.txt                                  |   3 +--
 7 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_clock.png
 create mode 100644 res/drawable-mdpi/ic_clock.png
 create mode 100644 res/drawable-xhdpi/ic_clock.png

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5eb7d274..f087d8cd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -44,8 +44,7 @@
         android:allowBackup="true"
         android:icon="@drawable/icon"
         android:label="@string/app"
-        android:supportsRtl="true"
-        android:uiOptions="splitActionBarWhenNarrow" >
+        android:supportsRtl="true" >
         <activity android:name=".AboutFragment" />
         <activity
             android:name=".VPNPreferences"
@@ -57,7 +56,10 @@
             android:launchMode="singleTask" />
         <activity android:name=".SendDumpFragment" />
         <activity android:name=".FileSelect" />
-        <activity android:name=".MainActivity" >
+        <activity
+            android:name=".MainActivity"
+            android:uiOptions="splitActionBarWhenNarrow"
+            tools:ignore="ExportedActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -97,7 +99,8 @@
 
         <activity
             android:name=".ConfigConverter"
-            android:label="Convert Config File" >
+            android:label="Convert Config File"
+            tools:ignore="ExportedActivity" >
             <intent-filter android:label="@string/import_config" >
                 <action android:name="android.intent.action.VIEW" />
 
@@ -135,7 +138,8 @@
         </activity>
         <activity
             android:name=".LaunchVPN"
-            android:label="@string/vpn_launch_title" >
+            android:label="@string/vpn_launch_title"
+            tools:ignore="ExportedActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/res/drawable-hdpi/ic_clock.png b/res/drawable-hdpi/ic_clock.png
new file mode 100644
index 00000000..22da1b4c
Binary files /dev/null and b/res/drawable-hdpi/ic_clock.png differ
diff --git a/res/drawable-mdpi/ic_clock.png b/res/drawable-mdpi/ic_clock.png
new file mode 100644
index 00000000..9ad15397
Binary files /dev/null and b/res/drawable-mdpi/ic_clock.png differ
diff --git a/res/drawable-xhdpi/ic_clock.png b/res/drawable-xhdpi/ic_clock.png
new file mode 100644
index 00000000..a2485f0e
Binary files /dev/null and b/res/drawable-xhdpi/ic_clock.png differ
diff --git a/res/menu/logmenu.xml b/res/menu/logmenu.xml
index ee0f86de..9e79702c 100644
--- a/res/menu/logmenu.xml
+++ b/res/menu/logmenu.xml
@@ -34,7 +34,7 @@
     <item
         android:id="@+id/toggle_time"
         android:alphabeticShortcut="t"
-        android:icon="@android:drawable/ic_menu_week"
+        android:icon="@drawable/ic_clock"
         android:showAsAction="withText|ifRoom"
         android:title="@string/toggle_timestamps"/>
 
diff --git a/src/de/blinkt/openvpn/VPNProfileList.java b/src/de/blinkt/openvpn/VPNProfileList.java
index 6c10e736..64a6f9dd 100644
--- a/src/de/blinkt/openvpn/VPNProfileList.java
+++ b/src/de/blinkt/openvpn/VPNProfileList.java
@@ -167,17 +167,17 @@ public class VPNProfileList extends ListFragment {
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		menu.add(0, MENU_ADD_PROFILE, 0, R.string.menu_add_profile)
+		menu.add(0, MENU_ADD_PROFILE, 0 , R.string.menu_add_profile)
 		.setIcon(android.R.drawable.ic_menu_add)
 		.setAlphabeticShortcut('a')
 		.setTitleCondensed(getActivity().getString(R.string.add))
-		.setShowAsAction(MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+		.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS |  MenuItem.SHOW_AS_ACTION_WITH_TEXT);
 
-		menu.add(0, MENU_IMPORT_PROFILE, 0, R.string.menu_import)
+		menu.add(0, MENU_IMPORT_PROFILE, 0,  R.string.menu_import)
 		.setIcon(R.drawable.ic_menu_archive)
 		.setAlphabeticShortcut('i')
 		.setTitleCondensed(getActivity().getString(R.string.menu_import_short))
-		.setShowAsAction(MenuItem.SHOW_AS_ACTION_WITH_TEXT );
+		.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT );
 	}
 
 
diff --git a/todo.txt b/todo.txt
index a8da2103..25b59a47 100644
--- a/todo.txt
+++ b/todo.txt
@@ -19,10 +19,9 @@ Ideas:
 - implement an encryption for profiles, so no sensitive data has be stored in plain text
    - encrypt/decrypt with android private storage key (+no user input required)
 
-Bugfixes:
- - startpath file explorer
  - hibernate when screen off and < 50 kB min
 
+
 Missing configuration options:
 
 Tap support:
-- 
cgit v1.2.3