Resolve generated WPS Pin is not displayed on screen.

Change-Id: I06c5b572288369f526574135f18ed78cba106ee3
Signed-off-by: Akash Kumar <akash1.kumar@samsung.com>

diff --git a/SettingWiFi/SettingWiFi/view/Resources.cs b/SettingWiFi/SettingWiFi/view/Resources.cs
index 227faed6e23f764e4f529412161ba920d3ce6c5e..e8c1edb0e331b20fbd6f95eb0bbdfb7fca2b83e4 100755 (executable)
--- a/SettingWiFi/SettingWiFi/view/Resources.cs
+++ b/SettingWiFi/SettingWiFi/view/Resources.cs
@@ -35,7 +35,7 @@
         static public string IDS_ST_BODY_GOOD_M_BATTERY = "Good";\r
         static public string IDS_ST_BODY_EXCELLENT = "Excellent";\r
         static public string IDS_ST_BODY_ENTER_THE_P1SS_PIN_ON_YOUR_WI_FI_ROUTER_THE_SETUP_CAN_TAKE_UP_TO_P2SD_MINUTES_TO_COMPLETE\r
-            = "Enter the %1$s PIN on your Wi-Fi router. The setup can take up to %2$d minutes to complete.";\r
+            = "Enter the {0} PIN on your Wi-Fi router. The setup can take up to {1} minutes to complete.";\r
         static public string IDS_ST_BODY_ADVANCED = "Advanced";\r
         static public string IDS_WIFI_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_PD_REACHED = "Maximum number of characters %d reached.";\r
         static public string IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS = "Failed to obtain IP address.";\r

diff --git a/SettingWiFi/SettingWiFi/view/WPSConnectPage.cs b/SettingWiFi/SettingWiFi/view/WPSConnectPage.cs
index 3f86bbf5141b697e9e84563fe9daaa3f644b2fe1..b31f7a4a5b022cf685445c906588c1ea780b887b 100755 (executable)
--- a/SettingWiFi/SettingWiFi/view/WPSConnectPage.cs
+++ b/SettingWiFi/SettingWiFi/view/WPSConnectPage.cs
@@ -132,15 +132,9 @@ namespace SettingWiFi
             };
 
             string timeout = "2";
-            var messageItem = new DefaultLinearItem()
-            {
-                WidthSpecification = LayoutParamPolicies.MatchParent,
-                // TODO
-                Text = Resources.IDS_ST_BODY_ENTER_THE_P1SS_PIN_ON_YOUR_WI_FI_ROUTER_THE_SETUP_CAN_TAKE_UP_TO_P2SD_MINUTES_TO_COMPLETE,
-                //Text = String.Format(Resources.IDS_ST_BODY_ENTER_THE_P1SS_PIN_ON_YOUR_WI_FI_ROUTER_THE_SETUP_CAN_TAKE_UP_TO_P2SD_MINUTES_TO_COMPLETE, pin, timeout),
-                IsSelectable = false,
-            };
-            messageItem.Label.HorizontalAlignment = HorizontalAlignment.Begin;
+            string message = string.Format(
+                Resources.IDS_ST_BODY_ENTER_THE_P1SS_PIN_ON_YOUR_WI_FI_ROUTER_THE_SETUP_CAN_TAKE_UP_TO_P2SD_MINUTES_TO_COMPLETE, pin, timeout);
+            var messageItem = new TextLabel(message);
 
             var progress = new Progress()
             {
@@ -301,7 +295,7 @@ namespace SettingWiFi
 
             var page = new WpsPinWaitPage(mWifi);
             page.CreateComponents(mAp, pin);
-
+            NUIApplication.GetDefaultWindow().GetDefaultNavigator().Pop();
             SettingCore.RoundedDialogPage.ShowDialog(page);
         }
 
@@ -315,4 +309,4 @@ namespace SettingWiFi
             await mWifi.ConnectWps(mAp, pin);
         }
     }
-}
\ No newline at end of file
+}

diff --git a/packaging/org.tizen.cssetting-wifi-1.1.3.rpk b/packaging/org.tizen.cssetting-wifi-1.1.3.rpk
index 8366f039acf3bf9a26d9828d0e8e236d40139396..8df5601fb6e0976cbbdeede089483fb25c4a7a62 100644 (file)
Binary files a/packaging/org.tizen.cssetting-wifi-1.1.3.rpk and b/packaging/org.tizen.cssetting-wifi-1.1.3.rpk differ