Merge branch 'dev' of github.com:forcedotcom/SalesforceMobileSDK-Android into dev

Author: wmathurin

.github/test-shards/SalesforceSDK.json

@@ -18,7 +18,7 @@
       "targets": [
         "class com.salesforce.androidsdk.ui.LoginViewActivityTest",
         "class com.salesforce.androidsdk.ui.PickerBottomSheetTest",
-        "class com.salesforce.androidsdk.ui.LoginActivityTest",
+        "class com.salesforce.androidsdk.ui.LoginActivityScenarioTest",
         "class com.salesforce.androidsdk.ui.LoginOptionsActivityTest",
         "class com.salesforce.androidsdk.ui.PickerBottomSheetActivityTest",
         "class com.salesforce.androidsdk.ui.DevInfoActivityTest",
@@ -53,7 +53,7 @@
         "notClass com.salesforce.androidsdk.analytics.SalesforceAnalyticsManagerTest",
         "notClass com.salesforce.androidsdk.ui.LoginViewActivityTest",
         "notClass com.salesforce.androidsdk.ui.PickerBottomSheetTest",
-        "notClass com.salesforce.androidsdk.ui.LoginActivityTest",
+        "notClass com.salesforce.androidsdk.ui.LoginActivityScenarioTest",
         "notClass com.salesforce.androidsdk.ui.LoginOptionsActivityTest",
         "notClass com.salesforce.androidsdk.ui.PickerBottomSheetActivityTest",
         "notClass com.salesforce.androidsdk.ui.DevInfoActivityTest",

libs/SalesforceSDK/res/values/strings.xml

@@ -8,6 +8,7 @@
     <string name="account_type">com.salesforce.androidsdk</string>
     <string name="app_package">com.salesforce.androidsdk</string>
     <string name="cannot_use_another_apps_login_qr_code">Cannot use another app\'s login QR Code.  Please log in to this app.</string>
+    <string name="salesforce_welcome_is_disabled">This app doesn\'t support welcome.salesforce.com. Use another server.</string>
 
     <!-- If you're only supporting recent versions of Android (e.g. 3.x and up), you can override this to be touch and get a better looking login UI  -->
     <string name="oauth_display_type">touch</string>

libs/SalesforceSDK/src/com/salesforce/androidsdk/config/LoginServerManager.java

@@ -452,7 +452,9 @@ private List<LoginServer> getLoginServersFromPreferences(SharedPreferences prefs
 	 */
 	public static class LoginServer {
 
+        @NonNull
 		public final String name;
+        @NonNull
 		public final String url;
 		public final boolean isCustom;