From 9fcc118b8a630b2e241bece04a9c8df5e7f08976 Mon Sep 17 00:00:00 2001 From: masensio Date: Mon, 14 Oct 2013 13:39:22 +0200 Subject: [PATCH] 0C-1647: Enable/Disable Create Account option --- res/values/setup.xml | 2 +- src/com/owncloud/android/ui/activity/AccountSelectActivity.java | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/res/values/setup.xml b/res/values/setup.xml index 8f18d6bd..3e53befd 100644 --- a/res/values/setup.xml +++ b/res/values/setup.xml @@ -8,6 +8,6 @@ off - true + false diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java index 2c3448d6..295f9a4a 100644 --- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java +++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java @@ -111,8 +111,11 @@ public class AccountSelectActivity extends SherlockListActivity implements @Override public boolean onCreateOptionsMenu(Menu menu) { - MenuInflater inflater = getSherlock().getMenuInflater(); - inflater.inflate(R.menu.account_picker, menu); + // Show Create Account if Multiaccount is enabled + if (getResources().getBoolean(R.bool.multiaccount_support)) { + MenuInflater inflater = getSherlock().getMenuInflater(); + inflater.inflate(R.menu.account_picker, menu); + } return true; } @@ -147,7 +150,6 @@ public class AccountSelectActivity extends SherlockListActivity implements this, null, null); - return true; } return false; @@ -212,6 +214,7 @@ public class AccountSelectActivity extends SherlockListActivity implements android.R.layout.simple_list_item_single_choice, new String[] { "NAME" }, new int[] { android.R.id.text1 })); registerForContextMenu(getListView()); + } @Override -- 2.11.0