Merge branch 'COPEqr' into 'master'

Add UI changes to enroll COPE using QR code

See merge request entgra/carbon-device-mgt-plugins!123

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.platform.configuration/configuration.hbs

@@ -166,6 +166,7 @@
                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                     </span>
                     <br>
+                    ( ex: www.abc.com:8280 )
 
                 </label>
                 <input id="android-kiosk-config-server-ip" type="text" class="form-control" >

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/js/type-view.js

@@ -108,7 +108,7 @@ function generateKIOSKQRCode(qrCodeClass) {
         function(data) {
             data = JSON.parse(data);
             if (data != null && data.configuration != null) {
-                if (ownership_type == "COSU") {
+                if (ownership_type == "COSU" || ownership_type == "COPE") {
                     for (var i = 0; i < data.configuration.length; i++) {
                         var config = data.configuration[i];
                         if (config.name === kioskConfigs["adminComponentName"]) {

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs

@@ -85,7 +85,7 @@
     <hr>
     <h3>Step 02 - Enroll the Android Agent.</h3><br>
         <p>Your device can be enrolled with Entgra IoTS automatically via QR code or manually by a wizard.
-            To enroll automatically; first download agent as mentioned in Step 1 then proceed with the ENROLL WITH QR option from the device setup activity.
+            To enroll automatically, first download and install the agent as mentioned in Step 1 then proceed with the ENROLL WITH QR option from the device setup activity.
             Thereafter select the ownership configuration and scan the generated QR to complete the process.
             To enroll manually; select the Manual enrollment option from the setup activity and follow the succeeding steps.</p>
         <br>