diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-03-08 20:33:53 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-03-08 20:33:53 +0100 |
commit | d3e7058d5049cd020798159c15185bd0d6e71e92 (patch) | |
tree | f83eca385a5aa4570f8a111ae58acb0c0fc2aa8e /src/main/res/menu | |
parent | a33032d9b70511561162bdab66c101a5e3e4a58e (diff) | |
parent | b95bdbe791a8b7609b46ec5b9c089b2dc2461314 (diff) |
Merge branch 'multi-account'
Diffstat (limited to 'src/main/res/menu')
-rw-r--r-- | src/main/res/menu/change_presence.xml | 5 | ||||
-rw-r--r-- | src/main/res/menu/verify_otr.xml | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/main/res/menu/change_presence.xml b/src/main/res/menu/change_presence.xml index 1a320d59e..34af0a679 100644 --- a/src/main/res/menu/change_presence.xml +++ b/src/main/res/menu/change_presence.xml @@ -5,11 +5,6 @@ android:showAsAction="always" android:icon="@drawable/ic_account_box_white_24dp" /> <item - android:id="@+id/action_accounts" - android:orderInCategory="90" - android:showAsAction="never" - android:title="@string/action_accounts" /> - <item android:id="@+id/action_settings" android:orderInCategory="100" android:showAsAction="never" diff --git a/src/main/res/menu/verify_otr.xml b/src/main/res/menu/verify_otr.xml index 17b6562c2..7dadffce8 100644 --- a/src/main/res/menu/verify_otr.xml +++ b/src/main/res/menu/verify_otr.xml @@ -7,11 +7,6 @@ android:showAsAction="never" /> <item - android:id="@+id/action_accounts" - android:orderInCategory="90" - android:showAsAction="never" - android:title="@string/action_accounts" /> - <item android:id="@+id/action_settings" android:orderInCategory="100" android:showAsAction="never" |