summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java3
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java4
-rw-r--r--main/src/main/res/menu/configmenu.xml2
-rw-r--r--main/src/main/res/menu/connections.xml2
-rw-r--r--main/src/main/res/menu/import_menu.xml4
-rw-r--r--main/src/main/res/menu/logmenu.xml10
-rw-r--r--main/src/main/res/menu/main_menu.xml2
-rw-r--r--main/src/main/res/menu/vpnpreferences_menu.xml4
8 files changed, 15 insertions, 16 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java b/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java
index efba038f..41206a54 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java
@@ -56,8 +56,7 @@ public class InlineFileTab extends Fragment
menu.add(0, MENU_SAVE, 0, R.string.menu_use_inline_data)
.setIcon(android.R.drawable.ic_menu_save)
.setAlphabeticShortcut('u')
- .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
- | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java b/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java
index 72c40c0e..db7fe038 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java
@@ -228,13 +228,13 @@ public class VPNProfileList extends ListFragment implements OnClickListener, Vpn
.setIcon(R.drawable.ic_menu_add)
.setAlphabeticShortcut('a')
.setTitleCondensed(getActivity().getString(R.string.add))
- .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
menu.add(0, MENU_IMPORT_PROFILE, 0, R.string.menu_import)
.setIcon(R.drawable.ic_menu_import)
.setAlphabeticShortcut('i')
.setTitleCondensed(getActivity().getString(R.string.menu_import_short))
- .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
}
diff --git a/main/src/main/res/menu/configmenu.xml b/main/src/main/res/menu/configmenu.xml
index 7487bdb5..fc73503b 100644
--- a/main/src/main/res/menu/configmenu.xml
+++ b/main/src/main/res/menu/configmenu.xml
@@ -9,7 +9,7 @@
<item
android:id="@+id/sendConfig"
android:icon="@drawable/ic_menu_share"
- android:showAsAction="ifRoom|withText"
+ android:showAsAction="ifRoom"
android:title="@string/send_config"
android:titleCondensed="@string/send"/>
diff --git a/main/src/main/res/menu/connections.xml b/main/src/main/res/menu/connections.xml
index ad516885..64ca4a2c 100644
--- a/main/src/main/res/menu/connections.xml
+++ b/main/src/main/res/menu/connections.xml
@@ -10,6 +10,6 @@
android:title="@string/add_remote"
android:id="@+id/add_new_remote"
android:titleCondensed="@string/add"
- android:showAsAction="withText|always"
+ android:showAsAction="always"
/>
</menu> \ No newline at end of file
diff --git a/main/src/main/res/menu/import_menu.xml b/main/src/main/res/menu/import_menu.xml
index a0e7b820..b552f0e5 100644
--- a/main/src/main/res/menu/import_menu.xml
+++ b/main/src/main/res/menu/import_menu.xml
@@ -8,14 +8,14 @@
<item
android:id="@+id/cancel"
android:icon="@drawable/ic_menu_close_clear_cancel"
- android:showAsAction="ifRoom|withText"
+ android:showAsAction="ifRoom"
android:title="@android:string/cancel"
android:titleCondensed="@string/cancel"/>
<item
android:id="@+id/ok"
android:icon="@drawable/ic_menu_save"
- android:showAsAction="ifRoom|withText"
+ android:showAsAction="ifRoom"
android:title="@string/add_profile"
android:titleCondensed="@string/import_vpn"/>
diff --git a/main/src/main/res/menu/logmenu.xml b/main/src/main/res/menu/logmenu.xml
index 1c94d97c..90eba679 100644
--- a/main/src/main/res/menu/logmenu.xml
+++ b/main/src/main/res/menu/logmenu.xml
@@ -11,32 +11,32 @@
android:id="@+id/toggle_time"
android:alphabeticShortcut="t"
android:icon="@drawable/ic_menu_view"
- android:showAsAction="withText|ifRoom"
+ android:showAsAction="ifRoom"
android:title="@string/logview_options" />
<item
android:id="@+id/clearlog"
android:icon="@drawable/ic_menu_delete"
- android:showAsAction="ifRoom|withText"
+ android:showAsAction="ifRoom"
android:title="@string/clear_log"
android:titleCondensed="@string/clear"/>
<item
android:id="@+id/send"
android:icon="@drawable/ic_menu_share"
- android:showAsAction="ifRoom|withText"
+ android:showAsAction="ifRoom"
android:title="@string/send_logfile"
android:titleCondensed="@string/send"/>
<item
android:id="@+id/cancel"
android:icon="@drawable/ic_menu_close_clear_cancel"
- android:showAsAction="ifRoom|withText"
+ android:showAsAction="ifRoom"
android:title="@string/cancel_connection_long"
android:titleCondensed="@string/cancel_connection"/>
<item
android:id="@+id/edit_vpn"
android:alphabeticShortcut="e"
android:icon="@drawable/ic_menu_edit"
- android:showAsAction="withText|ifRoom"
+ android:showAsAction="ifRoom"
android:title="@string/edit_vpn"/>
</menu> \ No newline at end of file
diff --git a/main/src/main/res/menu/main_menu.xml b/main/src/main/res/menu/main_menu.xml
index 6d4f7703..f5e0bf08 100644
--- a/main/src/main/res/menu/main_menu.xml
+++ b/main/src/main/res/menu/main_menu.xml
@@ -8,7 +8,7 @@
<item
android:id="@+id/show_log"
android:icon="@drawable/ic_receipt"
- android:showAsAction="ifRoom|withText"
+ android:showAsAction="ifRoom"
android:title="@string/show_log_window"
android:titleCondensed="@string/show_log"/>
</menu> \ No newline at end of file
diff --git a/main/src/main/res/menu/vpnpreferences_menu.xml b/main/src/main/res/menu/vpnpreferences_menu.xml
index 98b8636b..e31d6ddf 100644
--- a/main/src/main/res/menu/vpnpreferences_menu.xml
+++ b/main/src/main/res/menu/vpnpreferences_menu.xml
@@ -9,14 +9,14 @@
android:id="@+id/remove_vpn"
android:alphabeticShortcut="d"
android:icon="@drawable/ic_menu_delete"
- android:showAsAction="withText|ifRoom"
+ android:showAsAction="ifRoom"
android:title="@string/remove_vpn"/>
<item
android:id="@+id/duplicate_vpn"
android:alphabeticShortcut="c"
android:icon="@drawable/ic_menu_copy"
- android:showAsAction="withText|ifRoom"
+ android:showAsAction="ifRoom"
android:title="Duplicate VPN" />
</menu> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 08:43:16 +0000