Add IDS string keys

Change-Id: I8fe7b7c2c5d1b65255f00735efe86013ce5d8451
Signed-off-by: Wootak Jung <wootak.jung@samsung.com>

diff --git a/SettingBluetooth/SettingBluetooth/Controller/DeviceController.cs b/SettingBluetooth/SettingBluetooth/Controller/DeviceController.cs
index c188e6352853a9baa739ea6427dfb4d9f41c69af..02e3f45299385b6a6d19950d0290e2c5ab147ad5 100644 (file)
--- a/SettingBluetooth/SettingBluetooth/Controller/DeviceController.cs
+++ b/SettingBluetooth/SettingBluetooth/Controller/DeviceController.cs
@@ -29,8 +29,7 @@ namespace SettingBluetooth
                 PopDialog();
             };
 
-            //DialogPage.ShowAlertDialog(Resources.IDS_BT_HEADER_DISCONNECT_DEVICE_ABB, String.Format(Resources.IDS_WMGR_POP_THIS_WILL_END_YOUR_CONNECTION_WITH_PS, btDevice.Name), cancelButton, disconnectButton);
-            SettingCore.RoundedDialogPage.ShowAlertDialog("Disconnect device", String.Format("This will end your connection with {0}.", btDevice.Name), cancelButton, disconnectButton);
+            SettingCore.RoundedDialogPage.ShowAlertDialog(Resources.IDS_BT_HEADER_DISCONNECT_DEVICE_ABB, String.Format(Resources.IDS_WMGR_POP_THIS_WILL_END_YOUR_CONNECTION_WITH_PS, btDevice.Name), cancelButton, disconnectButton);
         }
 
         internal static void ConnectA2dp(BtDevice device)
@@ -45,8 +44,7 @@ namespace SettingBluetooth
             {
                 var disconnectButton = new Button()
                 {
-                    //Text = Resources.IDS_BT_SK_DISCONNECT,
-                    Text = "Disconnect",
+                    Text = Resources.IDS_BT_SK_DISCONNECT,
                 };
                 disconnectButton.Clicked += (obj, ev) =>
                 {
@@ -73,8 +71,7 @@ namespace SettingBluetooth
         {
             var disconnectButton = new Button()
             {
-                //Text = Resources.IDS_BT_SK_DISCONNECT,
-                Text = "Disconnect",
+                Text = Resources.IDS_BT_SK_DISCONNECT,
             };
             disconnectButton.Clicked += (obj, ev) =>
             {

diff --git a/SettingBluetooth/SettingBluetooth/View/BtDetailView.cs b/SettingBluetooth/SettingBluetooth/View/BtDetailView.cs
index a02292d69f6cf30ed6af3310a14504bc19c23d6b..bfff2710661c272f9f04ba561686204a762e2b76 100644 (file)
--- a/SettingBluetooth/SettingBluetooth/View/BtDetailView.cs
+++ b/SettingBluetooth/SettingBluetooth/View/BtDetailView.cs
@@ -22,8 +22,7 @@ namespace SettingBluetooth
 
             var appBar = new AppBar()
             {
-                //Title = Resources.IDS_BT_BODY_DETAILS,
-                Title = "Details",
+                Title = Resources.IDS_BT_BODY_DETAILS,
             };
 
             mDetailView = new View()
@@ -41,8 +40,7 @@ namespace SettingBluetooth
             {
                 WidthSpecification = LayoutParamPolicies.MatchParent,
                 Text = device.Name,
-                //SubText = Resources.IDS_BT_BODY_DEVICENAME,
-                SubText = "Device name",
+                SubText = Resources.IDS_BT_BODY_DEVICENAME,
             };
             mBtDeviceName = device.Name;
             deviceName.Clicked += OnDeviceNameClicked;
@@ -51,8 +49,7 @@ namespace SettingBluetooth
             var unpairButton = new DefaultLinearItem()
             {
                 WidthSpecification = LayoutParamPolicies.MatchParent,
-                //Text = Resources.IDS_BT_OPT_UNPAIR,
-                Text = "Unpair",
+                Text = Resources.IDS_BT_OPT_UNPAIR,
             };
             unpairButton.Clicked += (obj, ev) =>
             {
@@ -65,8 +62,7 @@ namespace SettingBluetooth
             var connOption = new DefaultLinearItem()
             {
                 WidthSpecification = LayoutParamPolicies.MatchParent,
-                //Text = Resources.IDS_BT_BODY_CONNECTION_OPTIONS,
-                Text = "Connection options",
+                Text = Resources.IDS_BT_BODY_CONNECTION_OPTIONS,
             };
             mDetailView.Add(connOption);
 
@@ -75,8 +71,7 @@ namespace SettingBluetooth
                 var mediaAudioItem = new DefaultLinearItem()
                 {
                     WidthSpecification = LayoutParamPolicies.MatchParent,
-                    //Text = Resources.IDS_BT_BODY_MEDIA_AUDIO,
-                    Text = "Media audio",
+                    Text = Resources.IDS_BT_BODY_MEDIA_AUDIO,
                 };
                 var mediaAudioSwitch = new Switch()
                 {

diff --git a/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs b/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs
index 09dafeacbc5d26060c7a1971ddc80d56d9bc5c8b..43b9b60a4e23f6d7db7b0cc496c39b0282716e92 100644 (file)
--- a/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs
+++ b/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs
@@ -248,10 +248,8 @@ namespace SettingBluetooth
         public DeviceSource()
         {
             Log.Info(SettingBluetooth.LogTag, "DeviceSource created");
-            //mSearched = new DeviceCollection(Resources.IDS_BT_BODY_SCANNING_FOR_DEVICES_ING);
-            mSearched = new DeviceCollection("Scanning for devices...");
-            //mPaired = new DeviceCollection(Resources.IDS_BT_BODY_PAIRED_DEVICES);
-            mPaired = new DeviceCollection("Paired devices");
+            mSearched = new DeviceCollection(Resources.IDS_BT_BODY_SCANNING_FOR_DEVICES_ING);
+            mPaired = new DeviceCollection(Resources.IDS_BT_BODY_PAIRED_DEVICES);
             this.Add(mSearched);
         }
 
@@ -343,25 +341,20 @@ namespace SettingBluetooth
                     break;
                 case BtDeviceState.Pairing:
                 case BtDeviceState.Connecting:
-                    //device.State = Resources.IDS_BT_SBODY_CONNECTING_ING;
-                    device.State = "Connecting...";
+                    device.State = Resources.IDS_BT_SBODY_CONNECTING_ING;
                     break;
                 case BtDeviceState.Unpairing:
                 case BtDeviceState.Disconnecting:
-                    //device.State = Resources.IDS_BT_BODY_DISCONNECTING;
-                    device.State = "Disconnecting";
+                    device.State = Resources.IDS_BT_BODY_DISCONNECTING;
                     break;
                 case BtDeviceState.Paired:
-                    //device.State = Resources.IDS_BT_BODY_PAIRED;
-                    device.State = "Paired";
+                    device.State = Resources.IDS_BT_BODY_PAIRED;
                     break;
                 case BtDeviceState.Connected:
-                    //device.State = Resources.IDS_BT_SBODY_CONNECTED_M_STATUS;
-                    device.State = "Connected";
+                    device.State = Resources.IDS_BT_SBODY_CONNECTED_M_STATUS;
                     break;
                 case BtDeviceState.ServiceSearching:
-                    //device.State = Resources.IDS_BT_POP_SEARCHING_SERVICES_ING;
-                    device.State = "Searching services...";
+                    device.State = Resources.IDS_BT_POP_SEARCHING_SERVICES_ING;
                     break;
             }
             //Log.Info(LogTag, "Device(" + btDevice.Address + ") updated. state: " + device.State);
@@ -462,8 +455,7 @@ namespace SettingBluetooth
 
             mScanButton = new Button
             {
-                //Text = Resources.IDS_BT_SK_SCAN,
-                Text = "Scan",
+                Text = Resources.IDS_BT_SK_SCAN,
             };
             mScanButton.Clicked += AdapterController.ScanButtonClicked;
             view.Add(mScanButton);

diff --git a/SettingBluetooth/SettingBluetooth/View/BtMainView.cs b/SettingBluetooth/SettingBluetooth/View/BtMainView.cs
index 2bfc35e36eb9804dc6cd5a9df00b0d0332f7268e..37ba038f5310e388e70b353a6139dd285ac68bb4 100644 (file)
--- a/SettingBluetooth/SettingBluetooth/View/BtMainView.cs
+++ b/SettingBluetooth/SettingBluetooth/View/BtMainView.cs
@@ -31,16 +31,12 @@ namespace SettingBluetooth
                     break;
                 case BtOperationState.Searching:
                     BtDeviceView.RemoveAllSearchedDevices();
-                    //BtDeviceView.UpdateSearchedTitle(Resources.IDS_BT_BODY_SCANNING_FOR_DEVICES_ING);
-                    //BtDeviceView.UpdateScanButtonText(Resources.IDS_BT_SK_STOP);
-                    BtDeviceView.UpdateSearchedTitle("Scanning for devices...");
-                    BtDeviceView.UpdateScanButtonText("Stop");
+                    BtDeviceView.UpdateSearchedTitle(Resources.IDS_BT_BODY_SCANNING_FOR_DEVICES_ING);
+                    BtDeviceView.UpdateScanButtonText(Resources.IDS_BT_SK_STOP);
                     break;
                 case BtOperationState.Searched:
-                    //BtDeviceView.UpdateSearchedTitle(Resources.IDS_BT_BODY_AVAILABLE_DEVICES);
-                    //BtDeviceView.UpdateScanButtonText(Resources.IDS_BT_SK_SCAN);
-                    BtDeviceView.UpdateSearchedTitle("Available devices");
-                    BtDeviceView.UpdateScanButtonText("Scan");
+                    BtDeviceView.UpdateSearchedTitle(Resources.IDS_BT_BODY_AVAILABLE_DEVICES);
+                    BtDeviceView.UpdateScanButtonText(Resources.IDS_BT_SK_SCAN);
                     break;
                 case BtOperationState.Pairing:
                     break;
@@ -70,8 +66,7 @@ namespace SettingBluetooth
             var onOffItem = new DefaultLinearItem
             {
                 WidthSpecification = LayoutParamPolicies.MatchParent,
-                //Text = Resources.IDS_BT_BODY_BLUETOOTH,
-                Text = "Bluetooth",
+                Text = Resources.IDS_BT_BODY_BLUETOOTH,
             };
             onOffItem.Label.HorizontalAlignment = HorizontalAlignment.Begin;
 

diff --git a/SettingBluetooth/SettingBluetooth/View/Resources.cs b/SettingBluetooth/SettingBluetooth/View/Resources.cs
index f6dced939f948113b2c3a1a3846435342d1163bc..a25f8d881447750ca8d1bf959ef9800d2604b428 100644 (file)
--- a/SettingBluetooth/SettingBluetooth/View/Resources.cs
+++ b/SettingBluetooth/SettingBluetooth/View/Resources.cs
@@ -16,5 +16,25 @@ namespace SettingBluetooth
         {
             return mResourcePath;
         }
+
+        static public string IDS_BT_BODY_SCANNING_FOR_DEVICES_ING = "Scanning for devices...";
+        static public string IDS_BT_SK_STOP = "Stop";
+        static public string IDS_BT_BODY_AVAILABLE_DEVICES = "Available devices";
+        static public string IDS_BT_SK_SCAN = "Scan";
+        static public string IDS_BT_BODY_BLUETOOTH = "Bluetooth";
+        static public string IDS_BT_BODY_PAIRED_DEVICES = "Paired devices";
+        static public string IDS_BT_SBODY_CONNECTING_ING = "Connecting...";
+        static public string IDS_BT_BODY_DISCONNECTING = "Disconnecting";
+        static public string IDS_BT_BODY_PAIRED = "Paired";
+        static public string IDS_BT_SBODY_CONNECTED_M_STATUS = "Connected";
+        static public string IDS_BT_POP_SEARCHING_SERVICES_ING = "Searching services...";
+        static public string IDS_BT_BODY_DETAILS = "Details";
+        static public string IDS_BT_BODY_DEVICENAME = "Device name";
+        static public string IDS_BT_OPT_UNPAIR = "Unpair";
+        static public string IDS_BT_BODY_CONNECTION_OPTIONS = "Connection options";
+        static public string IDS_BT_BODY_MEDIA_AUDIO = "Media audio";
+        static public string IDS_BT_SK_DISCONNECT = "Disconnect";
+        static public string IDS_BT_HEADER_DISCONNECT_DEVICE_ABB = "Disconnect device";
+        static public string IDS_WMGR_POP_THIS_WILL_END_YOUR_CONNECTION_WITH_PS = "This will end your connection with {0}.";
     }
 }