From db6fde2922d124b221fdd78ef79ed8651ac12956 Mon Sep 17 00:00:00 2001
From: Saad Sahibjan <saadsahibjan@gmail.com>
Date: Wed, 17 Apr 2019 17:06:44 +0530
Subject: [PATCH 1/2] Add single mode app kiosk policy UI

---
 .../public/js/operation-mod.js                |  6 +++
 .../public/templates/android-policy-edit.hbs  | 51 ++++++++++++------
 .../public/templates/android-policy-view.hbs  | 52 +++++++++++++------
 .../templates/android-policy-operations.hbs   | 51 ++++++++++++------
 4 files changed, 112 insertions(+), 48 deletions(-)

diff --git a/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.operation-mod/public/js/operation-mod.js b/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.operation-mod/public/js/operation-mod.js
index e4bd329745..fe820ecc38 100644
--- a/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.operation-mod/public/js/operation-mod.js
+++ b/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.operation-mod/public/js/operation-mod.js
@@ -211,6 +211,10 @@ var androidOperationModule = function () {
                     payload["kioskLogoImage"] = deviceGlobalConfigurations["kioskLogoImage"];
                     payload["kioskAppName"] = deviceGlobalConfigurations["kioskAppName"];
                     payload["isSingleModeApp"] = deviceGlobalConfigurations["isSingleModeApp"];
+                    if (payload["isSingleModeApp"] === true) {
+                        payload["isSingleModeAppBuiltForKiosk"] =
+                            deviceGlobalConfigurations["isSingleModeAppBuiltForKiosk"];
+                    }
                     payload["isIdleGraphicsEnabled"] = deviceGlobalConfigurations["isIdleGraphicsEnabled"];
                     payload["idleTimeout"] = deviceGlobalConfigurations["idleTimeout"];
                     payload["isMultiUserDevice"] = deviceGlobalConfigurations["isMultiUserDevice"];
@@ -515,6 +519,8 @@ var androidOperationModule = function () {
                              deviceGlobalConfigurations["singleModeApp"]
                                  = $(selectedSingleModeAppElement + "[data-child-key='packageName']").val();
                          }
+                         deviceGlobalConfigurations["isSingleModeAppBuiltForKiosk"] =
+                             operationData["isSingleModeAppBuiltForKiosk"];
                      }
                      deviceGlobalConfigurations["isIdleGraphicsEnabled"] = operationData["isIdleGraphicsEnabled"];
                      if (operationData["idleTimeout"]) {
diff --git a/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.policy-edit/public/templates/android-policy-edit.hbs b/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.policy-edit/public/templates/android-policy-edit.hbs
index 2d03185019..bcbe19cadc 100644
--- a/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.policy-edit/public/templates/android-policy-edit.hbs
+++ b/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.policy-edit/public/templates/android-policy-edit.hbs
@@ -1722,26 +1722,45 @@
                                                class="form-control operationDataKeys"  data-key="kioskAppName"
                                                maxlength="100" placeholder="Name to appear on the agent"/>
                                     </div>
-                                    <div>
-                                        <ul class="message message-info">
-                                            <i class="icon fw fw-info"></i>
-                                            Selected initial app in
-                                            <strong>Enrollment Application Install policy config</strong>
-                                            will be selected for single application mode
-                                        </ul>
-                                    </div>
-                                    <div class="wr-input-control">
-                                        <label class="wr-input-control checkbox">
-                                            <input id="cosu-global-config-is-single-application-mode" type="checkbox"
-                                                   class="form-control operationDataKeys"
-                                                   data-key="isSingleModeApp"/>
-                                            <span class="helper">
+                                    <!--COSU single mode application-->
+                                    <div id="cosu-profile-single-mode-app-configuration" class="panel">
+                                        <div class="wr-input-control sub-title panel-title"
+                                             style="padding: 0px; padding-right:15px; font-size:15px;">
                                             Is single application mode
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"
                                                   title="Is single application mode"></span>
-                                        </span>
-                                        </label>
+                                            <label class="wr-input-control checkbox">
+                                                <input id="cosu-global-config-is-single-application-mode" type="checkbox"
+                                                       class="form-control operationDataKeys"
+                                                       data-key="isSingleModeApp"
+                                                       onchange="changeDivVisibility('single-mode-kiosk-app', this)"/>
+                                                <span class="helper"></span>
+                                            </label>
+                                        </div>
+                                        <div id="single-mode-kiosk-app" class="panel-collapse panel-body collapse-config"
+                                             role="tabpanel" style="display: none;" >
+                                            <div>
+                                                <ul class="message message-info">
+                                                    <i class="icon fw fw-info"></i>
+                                                    Selected initial app in
+                                                    <strong>Enrollment Application Install policy config</strong>
+                                                    will be selected for single application mode
+                                                </ul>
+                                            </div>
+                                            <div class="wr-input-control">
+                                                <label class="wr-input-control checkbox">
+                                                    <input id="cosu-profile-single-mode-is-kiosk-app" type="checkbox"
+                                                           class="form-control operationDataKeys"
+                                                           data-key="isSingleModeAppBuiltForKiosk" checked="checked"/>
+                                                    <span class="helper" title="Is single mode app built for Kiosk. Enable if lock task method is called in the application">
+                                                        Is application built for Kiosk
+                                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                                    </span>
+                                                </label>
+                                            </div>
+                                        </div>
                                     </div>
+                                    <!--COSU single mode application-->
                                     <div id="cosu-profile-idle-media-configuration" class="panel">
                                         <div class="wr-input-control sub-title panel-title"
                                              style="padding: 0px; padding-right:15px; font-size:15px;">
diff --git a/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.policy-view/public/templates/android-policy-view.hbs b/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.policy-view/public/templates/android-policy-view.hbs
index d169203e57..75829fefac 100644
--- a/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.policy-view/public/templates/android-policy-view.hbs
+++ b/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.policy-view/public/templates/android-policy-view.hbs
@@ -1327,26 +1327,46 @@
                                                class="form-control operationDataKeys" data-key="kioskAppName"
                                                maxlength="100" placeholder="Name to appear on the agent" disabled/>
                                     </div>
-                                    <div>
-                                        <ul class="message message-info">
-                                            <i class="icon fw fw-info"></i>
-                                            Selected initial app in
-                                            <strong>Enrollment Application Install policy config</strong>
-                                            will be selected for single application mode
-                                        </ul>
-                                    </div>
-                                    <div class="wr-input-control">
-                                        <label class="wr-input-control checkbox">
-                                            <input id="cosu-global-config-is-single-application-mode" type="checkbox"
-                                                   class="form-control operationDataKeys"
-                                                   data-key="isSingleModeApp" disabled/>
-                                            <span class="helper">
+                                    <!--COSU single mode application-->
+                                    <div id="cosu-profile-single-mode-app-configuration" class="panel">
+                                        <div class="wr-input-control sub-title panel-title"
+                                             style="padding: 0px; padding-right:15px; font-size:15px;">
                                             Is single application mode
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"
                                                   title="Is single application mode"></span>
-                                        </span>
-                                        </label>
+                                            <label class="wr-input-control checkbox">
+                                                <input id="cosu-global-config-is-single-application-mode" type="checkbox"
+                                                       class="form-control operationDataKeys"
+                                                       data-key="isSingleModeApp" disabled
+                                                       onchange="changeDivVisibility('single-mode-kiosk-app', this)"/>
+                                                <span class="helper"></span>
+                                            </label>
+                                        </div>
+                                        <div id="single-mode-kiosk-app" class="panel-collapse panel-body collapse-config"
+                                             role="tabpanel" style="display: none;" >
+                                            <div>
+                                                <ul class="message message-info">
+                                                    <i class="icon fw fw-info"></i>
+                                                    Selected initial app in
+                                                    <strong>Enrollment Application Install policy config</strong>
+                                                    will be selected for single application mode
+                                                </ul>
+                                            </div>
+                                            <div class="wr-input-control">
+                                                <label class="wr-input-control checkbox">
+                                                    <input id="cosu-profile-single-mode-is-kiosk-app" type="checkbox"
+                                                           class="form-control operationDataKeys"
+                                                           data-key="isSingleModeAppBuiltForKiosk"
+                                                           checked="checked" disabled/>
+                                                    <span class="helper" title="Is single mode app built for Kiosk. Enable if lock task method is called in the application">
+                                                        Is application built for Kiosk
+                                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                                    </span>
+                                                </label>
+                                            </div>
+                                        </div>
                                     </div>
+                                    <!--COSU single mode application-->
                                     <div id="cosu-profile-idle-media-configuration" class="panel">
                                         <div class="wr-input-control sub-title panel-title"
                                              style="padding: 0px; padding-right:15px; font-size:15px;">
diff --git a/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.policy-wizard/public/templates/android-policy-operations.hbs b/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.policy-wizard/public/templates/android-policy-operations.hbs
index c6d8c63112..1c03808367 100644
--- a/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.policy-wizard/public/templates/android-policy-operations.hbs
+++ b/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.policy-wizard/public/templates/android-policy-operations.hbs
@@ -1453,26 +1453,45 @@
                                                class="form-control operationDataKeys"  data-key="kioskAppName"
                                                maxlength="100" placeholder="Name to appear on the agent"/>
                                     </div>
-                                    <div>
-                                        <ul class="message message-info">
-                                            <i class="icon fw fw-info"></i>
-                                            Selected initial app in
-                                            <strong>Enrollment Application Install policy config</strong>
-                                            will be selected for single application mode
-                                        </ul>
-                                    </div>
-                                    <div class="wr-input-control">
-                                        <label class="wr-input-control checkbox">
-                                            <input id="cosu-global-config-is-single-application-mode" type="checkbox"
-                                                   class="form-control operationDataKeys"
-                                                   data-key="isSingleModeApp"/>
-                                            <span class="helper">
+                                    <!--COSU single mode application-->
+                                    <div id="cosu-profile-single-mode-app-configuration" class="panel">
+                                        <div class="wr-input-control sub-title panel-title"
+                                             style="padding: 0px; padding-right:15px; font-size:15px;">
                                             Is single application mode
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"
                                                   title="Is single application mode"></span>
-                                        </span>
-                                        </label>
+                                            <label class="wr-input-control checkbox">
+                                                <input id="cosu-global-config-is-single-application-mode" type="checkbox"
+                                                       class="form-control operationDataKeys"
+                                                       data-key="isSingleModeApp"
+                                                       onchange="changeDivVisibility('single-mode-kiosk-app', this)"/>
+                                                <span class="helper"></span>
+                                            </label>
+                                        </div>
+                                        <div id="single-mode-kiosk-app" class="panel-collapse panel-body collapse-config"
+                                             role="tabpanel" style="display: none;" >
+                                            <div>
+                                                <ul class="message message-info">
+                                                    <i class="icon fw fw-info"></i>
+                                                    Selected initial app in
+                                                    <strong>Enrollment Application Install policy config</strong>
+                                                    will be selected for single application mode
+                                                </ul>
+                                            </div>
+                                            <div class="wr-input-control">
+                                                <label class="wr-input-control checkbox">
+                                                    <input id="cosu-profile-single-mode-is-kiosk-app" type="checkbox"
+                                                           class="form-control operationDataKeys"
+                                                           data-key="isSingleModeAppBuiltForKiosk" checked="checked"/>
+                                                    <span class="helper" title="Is single mode app built for Kiosk. Enable if lock task method is called in the application">
+                                                        Is application built for Kiosk
+                                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                                    </span>
+                                                </label>
+                                            </div>
+                                        </div>
                                     </div>
+                                    <!--COSU single mode application-->
                                     <div id="cosu-profile-idle-media-configuration" class="panel">
                                         <div class="wr-input-control sub-title panel-title"
                                                 style="padding: 0px; padding-right:15px; font-size:15px;">

From cc798c49953a7d8a5a80da06c30a6535aaee2c76 Mon Sep 17 00:00:00 2001
From: Saad Sahibjan <saadsahibjan@gmail.com>
Date: Thu, 18 Apr 2019 11:23:08 +0530
Subject: [PATCH 2/2] Fix spelling mistakes in browser property policy UI

---
 .../public/templates/android-policy-edit.hbs  | 22 +++++++++----------
 .../public/templates/android-policy-view.hbs  | 22 +++++++++----------
 .../templates/android-policy-operations.hbs   | 22 +++++++++----------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/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.policy-edit/public/templates/android-policy-edit.hbs b/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.policy-edit/public/templates/android-policy-edit.hbs
index bcbe19cadc..c2e2cb227b 100644
--- a/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.policy-edit/public/templates/android-policy-edit.hbs
+++ b/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.policy-edit/public/templates/android-policy-edit.hbs
@@ -1967,8 +1967,8 @@
                                                            class="form-control operationDataKeys"
                                                            data-key="isTopBarEnabled"/>
                                                     <span class="helper"
-                                                          title="Enabled top control bar that displays all the controllers such as address bar, home button and forwards controllers">
-                                                        Enabled top control bar
+                                                          title="Enable top control bar that displays all the controllers such as address bar, home button and forwards controllers">
+                                                        Enable top control bar
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                 </label>
@@ -2036,8 +2036,8 @@
                                                     <input id="cosu-browser-property-lock-to-primary-url" type="checkbox"
                                                            class="form-control operationDataKeys"
                                                            data-key="lockToPrimaryURL" checked />
-                                                    <span class="helper" title="Only allowed to visit the pirmary url.">
-                                                        Only allowed to visit the pirmary url
+                                                    <span class="helper" title="Only allowed to visit the primary url.">
+                                                        Only allowed to visit the primary url
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                 </label>
@@ -2096,8 +2096,8 @@
                                                     <input id="cosu-browser-property-is-form-auto-fill-enabled" type="checkbox"
                                                            class="form-control operationDataKeys"
                                                            data-key="isFormAutoFillEnabled"/>
-                                                    <span class="helper" title="Is form auto-fille enabled.">
-                                                        Is form auto-fille enabled
+                                                    <span class="helper" title="Is form auto-fill enabled.">
+                                                        Is form auto-fill enabled
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                 </label>
@@ -2144,15 +2144,15 @@
                                                     <input id="cosu-browser-property-is-app-cache-enabled" type="checkbox"
                                                            class="form-control operationDataKeys"
                                                            data-key="isAppCacheEnabled"/>
-                                                    <span class="helper" title="Is application chche enabled.">
-                                                        Is application chche enabled
+                                                    <span class="helper" title="Is application cache enabled.">
+                                                        Is application cache enabled
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                 </label>
                                             </div>
                                             <div class="wr-input-control">
                                                 <label class="wr-input-label">
-                                                    Application caches file path
+                                                    Application cache file path
                                                     <span class="helper" title="Sets the path to the Application Caches files. In order for the Application Caches API to be enabled, this method must be called with a path to which the application can write">
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
@@ -2229,7 +2229,7 @@
                                                            class="form-control operationDataKeys"
                                                            data-key="isDisplayZoomControls"/>
                                                     <span class="helper" title="Sets whether the browser should display on-screen zoom controls. Guesture based controllers are still available">
-                                                        Show on-screen zoom controlers
+                                                        Show on-screen zoom controllers
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                 </label>
@@ -2259,7 +2259,7 @@
                                             </div>
                                             <div class="wr-input-control">
                                                 <label class="wr-input-label">
-                                                    Defaut text encoding name
+                                                    Default text encoding name
                                                     <span class="helper" title="Sets the default text encoding name to use when decoding html pages.">
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
diff --git a/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.policy-view/public/templates/android-policy-view.hbs b/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.policy-view/public/templates/android-policy-view.hbs
index 75829fefac..8d8f78d00f 100644
--- a/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.policy-view/public/templates/android-policy-view.hbs
+++ b/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.policy-view/public/templates/android-policy-view.hbs
@@ -1572,8 +1572,8 @@
                                                     <input id="cosu-browser-property-top-bar-enabled" type="checkbox"
                                                            class="form-control operationDataKeys"
                                                            data-key="isTopBarEnabled" disabled/>
-                                                    <span class="helper" title="Enabled top control bar that displays all the controllers such as address bar, home button and forwards controllers">
-                                                        Enabled top control bar
+                                                    <span class="helper" title="Enable top control bar that displays all the controllers such as address bar, home button and forwards controllers">
+                                                        Enable top control bar
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                 </label>
@@ -1642,8 +1642,8 @@
                                                     <input id="cosu-browser-property-lock-to-primary-url" type="checkbox"
                                                            class="form-control operationDataKeys"
                                                            data-key="lockToPrimaryURL" disabled/>
-                                                    <span class="helper" title="Only allowed to visit the pirmary url.">
-                                                        Only allowed to visit the pirmary url
+                                                    <span class="helper" title="Only allowed to visit the primary url.">
+                                                        Only allowed to visit the primary url
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                 </label>
@@ -1702,8 +1702,8 @@
                                                     <input id="cosu-browser-property-is-form-auto-fill-enabled" type="checkbox"
                                                            class="form-control operationDataKeys"
                                                            data-key="isFormAutoFillEnabled" disabled/>
-                                                    <span class="helper" title="Is form auto-fille enabled.">
-                                                        Is form auto-fille enabled
+                                                    <span class="helper" title="Is form auto-fill enabled.">
+                                                        Is form auto-fill enabled
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                 </label>
@@ -1750,15 +1750,15 @@
                                                     <input id="cosu-browser-property-is-app-cache-enabled" type="checkbox"
                                                            class="form-control operationDataKeys"
                                                            data-key="isAppCacheEnabled" disabled/>
-                                                    <span class="helper" title="Is application chche enabled.">
-                                                        Is application chche enabled
+                                                    <span class="helper" title="Is application cache enabled.">
+                                                        Is application cache enabled
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                 </label>
                                             </div>
                                             <div class="wr-input-control">
                                                 <label class="wr-input-label">
-                                                    Application caches file path
+                                                    Application cache file path
                                                     <span class="helper" title="Sets the path to the Application Caches files. In order for the Application Caches API to be enabled, this method must be called with a path to which the application can write">
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
@@ -1835,7 +1835,7 @@
                                                            class="form-control operationDataKeys"
                                                            data-key="isDisplayZoomControls" disabled/>
                                                     <span class="helper" title="Sets whether the browser should display on-screen zoom controls. Guesture based controllers are still available">
-                                                        Show on-screen zoom controlers
+                                                        Show on-screen zoom controllers
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                 </label>
@@ -1865,7 +1865,7 @@
                                             </div>
                                             <div class="wr-input-control">
                                                 <label class="wr-input-label">
-                                                    Defaut text encoding name
+                                                    Default text encoding name
                                                     <span class="helper" title="Sets the default text encoding name to use when decoding html pages.">
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
diff --git a/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.policy-wizard/public/templates/android-policy-operations.hbs b/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.policy-wizard/public/templates/android-policy-operations.hbs
index 1c03808367..79bb6d4027 100644
--- a/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.policy-wizard/public/templates/android-policy-operations.hbs
+++ b/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.policy-wizard/public/templates/android-policy-operations.hbs
@@ -1697,8 +1697,8 @@
                                                     <input id="cosu-browser-property-top-bar-enabled" type="checkbox"
                                                            class="form-control operationDataKeys"
                                                            data-key="isTopBarEnabled"/>
-                                                    <span class="helper" title="Enabled top control bar that displays all the controllers such as address bar, home button and forwards controllers">
-                                                        Enabled top control bar
+                                                    <span class="helper" title="Enable top control bar that displays all the controllers such as address bar, home button and forwards controllers">
+                                                        Enable top control bar
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                 </label>
@@ -1766,8 +1766,8 @@
                                                     <input id="cosu-browser-property-lock-to-primary-url" type="checkbox"
                                                            class="form-control operationDataKeys"
                                                            data-key="lockToPrimaryURL" checked />
-                                                    <span class="helper" title="Only allowed to visit the pirmary url.">
-                                                        Only allowed to visit the pirmary url
+                                                    <span class="helper" title="Only allowed to visit the primary url.">
+                                                        Only allowed to visit the primary url
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                 </label>
@@ -1826,8 +1826,8 @@
                                                     <input id="cosu-browser-property-is-form-auto-fill-enabled" type="checkbox"
                                                            class="form-control operationDataKeys"
                                                            data-key="isFormAutoFillEnabled"/>
-                                                    <span class="helper" title="Is form auto-fille enabled.">
-                                                        Is form auto-fille enabled
+                                                    <span class="helper" title="Is form auto-fill enabled.">
+                                                        Is form auto-fill enabled
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                 </label>
@@ -1874,15 +1874,15 @@
                                                     <input id="cosu-browser-property-is-app-cache-enabled" type="checkbox"
                                                            class="form-control operationDataKeys"
                                                            data-key="isAppCacheEnabled"/>
-                                                    <span class="helper" title="Is application chche enabled.">
-                                                        Is application chche enabled
+                                                    <span class="helper" title="Is application cache enabled.">
+                                                        Is application cache enabled
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                 </label>
                                             </div>
                                             <div class="wr-input-control">
                                                 <label class="wr-input-label">
-                                                    Application caches file path
+                                                    Application cache file path
                                                     <span class="helper" title="Sets the path to the Application Caches files. In order for the Application Caches API to be enabled, this method must be called with a path to which the application can write">
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
@@ -1959,7 +1959,7 @@
                                                            class="form-control operationDataKeys"
                                                            data-key="isDisplayZoomControls"/>
                                                     <span class="helper" title="Sets whether the browser should display on-screen zoom controls. Guesture based controllers are still available">
-                                                        Show on-screen zoom controlers
+                                                        Show on-screen zoom controllers
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                 </label>
@@ -1989,7 +1989,7 @@
                                             </div>
                                             <div class="wr-input-control">
                                                 <label class="wr-input-label">
-                                                    Defaut text encoding name
+                                                    Default text encoding name
                                                     <span class="helper" title="Sets the default text encoding name to use when decoding html pages.">
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>