diff options
| author |   Samuel Holland <samuel@sholland.org> | 2017-08-10 01:04:46 -0500 |
|---|---|---|
| committer | Samuel Holland <samuel@sholland.org> | 2017-08-10 01:04:46 -0500 |
| commit | 87d3200b29d43ec5ee93de18d016c483cb3cb239 (patch) | |
| tree | bfbf77f55083ffd8ee5771ae73bce7c77f38aed5 /app/src/main/res/menu | |
| parent | ProfileFragment: Make good use of the cached profile (diff) | |
| download | wireguard-android-87d3200b29d43ec5ee93de18d016c483cb3cb239.tar.xz wireguard-android-87d3200b29d43ec5ee93de18d016c483cb3cb239.zip | |
ProfileActivity: Do menus correctly
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main/res/menu')
| -rw-r--r-- | app/src/main/res/menu/main.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/menu/profile_detail.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/menu/profile_edit.xml (renamed from app/src/main/res/menu/profile_detail_edit.xml) | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index 96479d08..462558ec 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item + android:id="@+id/menu_settings" android:alphabeticShortcut="s" android:icon="@drawable/ic_settings" - android:onClick="onMenuSettings" android:showAsAction="never" - android:title="@string/settings"/> + android:title="@string/settings" /> </menu> diff --git a/app/src/main/res/menu/profile_detail.xml b/app/src/main/res/menu/profile_detail.xml index 499adcdb..c00c1603 100644 --- a/app/src/main/res/menu/profile_detail.xml +++ b/app/src/main/res/menu/profile_detail.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item + android:id="@+id/menu_action_edit" android:alphabeticShortcut="e" android:icon="@drawable/ic_action_edit" - android:onClick="onMenuEdit" android:showAsAction="always" android:title="@string/edit" /> </menu> diff --git a/app/src/main/res/menu/profile_detail_edit.xml b/app/src/main/res/menu/profile_edit.xml index ad97fcbf..44e719c7 100644 --- a/app/src/main/res/menu/profile_detail_edit.xml +++ b/app/src/main/res/menu/profile_edit.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item + android:id="@+id/menu_action_save" android:alphabeticShortcut="s" android:icon="@drawable/ic_action_save" - android:onClick="onMenuSave" android:showAsAction="always" android:title="@string/save" /> </menu> |