diff options
| author | cyBerta <cyberta@riseup.net> | 2018-01-17 14:35:48 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-01-17 14:35:48 +0100 |
| commit | 20582f79321627257d1b66b22af791e9e22817fd (patch) | |
| tree | 0402daf13f51dcf7f9eba319eb8e26dcc2a79d10 /app/src/main/res/menu | |
| parent | 1bb789a9ee39ea8ef652855d8fc4add01848d88f (diff) | |
| parent | 58f13c43e70cad2429c9fa10efbc0b6756798800 (diff) | |
Merge branch 'fupduck_drawer' into mirror_0xacab_0.9.8
Diffstat (limited to 'app/src/main/res/menu')
| -rw-r--r-- | app/src/main/res/menu/f_log.xml | 31 | ||||
| -rw-r--r-- | app/src/main/res/menu/main.xml | 13 |
2 files changed, 44 insertions, 0 deletions
diff --git a/app/src/main/res/menu/f_log.xml b/app/src/main/res/menu/f_log.xml new file mode 100644 index 00000000..d30b13cb --- /dev/null +++ b/app/src/main/res/menu/f_log.xml @@ -0,0 +1,31 @@ +<?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" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + + <item + android:id="@+id/toggle_time" + android:alphabeticShortcut="t" + android:icon="@drawable/ic_menu_view" + app:showAsAction="ifRoom" + android:title="@string/logview_options" /> + + <item + android:id="@+id/clearlog" + android:icon="@drawable/ic_menu_delete" + app:showAsAction="ifRoom" + android:title="@string/clear_log" + android:titleCondensed="@string/clear"/> + <item + android:id="@+id/send" + android:icon="@drawable/ic_menu_share" + app:showAsAction="ifRoom" + android:title="@string/send_logfile" + android:titleCondensed="@string/send"/> + +</menu> diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml new file mode 100644 index 00000000..56f43959 --- /dev/null +++ b/app/src/main/res/menu/main.xml @@ -0,0 +1,13 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + tools:context="se.leap.bitmaskclient.MainActivity"> + <item + android:id="@+id/action_example" + android:showAsAction="withText|ifRoom" + android:title="@string/action_example" /> + <item + android:id="@+id/action_settings" + android:orderInCategory="100" + android:showAsAction="never" + android:title="@string/action_settings" /> +</menu> |