Merge pull request #1543 from aws-lumberyard-dev/native-ui-changes

More specific component error messaging and modes for native UI to prevent blocking dialog in some applications

Code/Framework/AzCore/Platform/Android/AzCore/NativeUI/NativeUISystemComponent_Android.cpp

@@ -19,6 +19,11 @@ namespace AZ
     {
         AZStd::string NativeUISystem::DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const
         {
+            if (m_mode == NativeUI::Mode::DISABLED)
+            {
+                return {};
+            }
+
             AZ::Android::JNI::Object object("com/amazon/lumberyard/NativeUI/LumberyardNativeUI");
             object.RegisterStaticMethod("DisplayDialog", "(Landroid/app/Activity;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V");
             object.RegisterStaticMethod("GetUserSelection", "()Ljava/lang/String;");

Code/Framework/AzCore/Platform/Mac/AzCore/NativeUI/NativeUISystemComponent_Mac.mm

@@ -23,6 +23,11 @@ namespace AZ
     {
         AZStd::string NativeUISystem::DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const
         {
+            if (m_mode == NativeUI::Mode::DISABLED)
+            {
+                return {};
+            }
+
             __block NSModalResponse response = -1;
             
             auto showDialog = ^()

Code/Framework/AzCore/Platform/Windows/AzCore/NativeUI/NativeUISystemComponent_Windows.cpp

@@ -242,6 +242,11 @@ namespace AZ
     {
         AZStd::string NativeUISystem::DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const
         {
+            if (m_mode == NativeUI::Mode::DISABLED)
+            {
+                return {};
+            }
+
             if (options.size() >= MAX_ITEMS)
             {
                 AZ_Assert(false, "Cannot create dialog box with more than %d buttons", (MAX_ITEMS - 1));

Code/Framework/AzCore/Platform/iOS/AzCore/NativeUI/NativeUISystemComponent_iOS.mm

@@ -15,6 +15,11 @@ namespace AZ
     {
         AZStd::string NativeUISystem::DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const
         {
+            if (m_mode == NativeUI::Mode::DISABLED)
+            {
+                return {};
+            }
+
             __block AZStd::string userSelection = "";
             
             NSString* nsTitle = [NSString stringWithUTF8String:title.c_str()];