diff options
| author | Fup Duck <fupduck@sacknagel.com> | 2018-02-16 10:38:41 +0100 |
|---|---|---|
| committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-16 10:38:41 +0100 |
| commit | 9108878992e9825a00c44f0596818d0ab245b183 (patch) | |
| tree | 088b116ca4b1236827337a3d5ae204abc0f907bb /app/src/main/res/menu | |
| parent | 6c1434addf1ee25a8c7ce30c240e2033d5075f35 (diff) | |
| parent | 0365f243fc56112b2f43b35e1b4884d2d1ad2aa4 (diff) | |
Merge branch 'leap_0.9.8' into #8797_certificate_expiration
Diffstat (limited to 'app/src/main/res/menu')
| -rw-r--r-- | app/src/main/res/menu/client_dashboard.xml | 19 | ||||
| -rw-r--r-- | app/src/main/res/menu/logmenu.xml | 44 |
2 files changed, 0 insertions, 63 deletions
diff --git a/app/src/main/res/menu/client_dashboard.xml b/app/src/main/res/menu/client_dashboard.xml deleted file mode 100644 index e0336cc0..00000000 --- a/app/src/main/res/menu/client_dashboard.xml +++ /dev/null @@ -1,19 +0,0 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android" > - <item - android:id="@+id/about_leap" - android:orderInCategory="110" - android:title="@string/about"/> - <item - android:id="@+id/log_window" - android:title="@string/show_log_window" - android:visible="true"/> - <item - android:id="@+id/switch_provider" - android:orderInCategory="501" - android:title="@string/switch_provider_menu_option"/> - <item - android:id="@+id/signup_button" - android:title="@string/signup_button" - android:visible="false"/> - -</menu> diff --git a/app/src/main/res/menu/logmenu.xml b/app/src/main/res/menu/logmenu.xml deleted file mode 100644 index 4c8daf35..00000000 --- a/app/src/main/res/menu/logmenu.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (c) 2012-2016 Arne Schwabe - ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt - --> - -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - - - <item - android:id="@+id/toggle_time" - android:alphabeticShortcut="t" - android:icon="@drawable/ic_menu_view" - android:showAsAction="ifRoom" - android:title="@string/logview_options" /> - - <item - android:id="@+id/clearlog" - android:icon="@drawable/ic_menu_delete" - 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" - 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" - 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:title="@string/edit_vpn" - android:visible="false"/> - -</menu> |