rajitha
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'keepDisplay' into 'master'

Browse Source 
Add COSU profile configuration to enable/disable the always-on display.

See merge request entgra/carbon-device-mgt-plugins!115
revert-dabc3590
Dharmakeerthi Lasantha 5 years ago
parent c5c4e0a5b9 11483c6f6b
commit 0d4623816f
4 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File

3
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
Unescape View File

@ -235,6 +235,8 @@ var androidOperationModule = function () {
payload["kioskLogoImage"] = deviceGlobalConfigurations["kioskLogoImage"]; payload["kioskLogoImage"] = deviceGlobalConfigurations["kioskLogoImage"];
payload["kioskAppName"] = deviceGlobalConfigurations["kioskAppName"]; payload["kioskAppName"] = deviceGlobalConfigurations["kioskAppName"];
payload["isSingleModeApp"] = deviceGlobalConfigurations["isSingleModeApp"]; payload["isSingleModeApp"] = deviceGlobalConfigurations["isSingleModeApp"];
payload["keepDisplayAwake"] = deviceGlobalConfigurations["keepDisplayAwake"];
if (payload["isSingleModeApp"] === true) { if (payload["isSingleModeApp"] === true) {
payload["isSingleModeAppBuiltForKiosk"] = payload["isSingleModeAppBuiltForKiosk"] =
deviceGlobalConfigurations["isSingleModeAppBuiltForKiosk"]; deviceGlobalConfigurations["isSingleModeAppBuiltForKiosk"];
@ -589,6 +591,7 @@ var androidOperationModule = function () {
operationData["isSingleModeAppBuiltForKiosk"]; operationData["isSingleModeAppBuiltForKiosk"];
} }
deviceGlobalConfigurations["isIdleGraphicsEnabled"] = operationData["isIdleGraphicsEnabled"]; deviceGlobalConfigurations["isIdleGraphicsEnabled"] = operationData["isIdleGraphicsEnabled"];
deviceGlobalConfigurations["keepDisplayAwake"] = operationData["keepDisplayAwake"];
if (operationData["idleTimeout"]) { if (operationData["idleTimeout"]) {
deviceGlobalConfigurations["idleTimeout"] = operationData["idleTimeout"]; deviceGlobalConfigurations["idleTimeout"] = operationData["idleTimeout"];
} }

15
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
Unescape View File

@ -2241,6 +2241,21 @@
</div> </div>
</div> </div>
</div> </div>
<!--keep display awake configuration-->
<div class="wr-input-control">
<div class="wr-input-control sub-title panel-title"
style="padding: 0px; padding-right:15px; font-size:15px;">
Keep display awake
<span class="wr-help-tip glyphicon glyphicon-question-sign"
title="Keep display awake"></span>
<label class="wr-input-control checkbox">
<input id="cosu-global-config-keep-display-awake" type="checkbox"
class="form-control operationDataKeys cosu-profile-config"
data-key="keepDisplayAwake"/>
<span class="helper"></span>
</label>
</div>
</div>
<!--COSU profile user app configuration--> <!--COSU profile user app configuration-->
<div id="cosu-profile-user-app-configuration" class="panel"> <div id="cosu-profile-user-app-configuration" class="panel">
<div class="wr-input-control sub-title panel-title" <div class="wr-input-control sub-title panel-title"

15
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
Unescape View File

@ -1690,6 +1690,21 @@
</div> </div>
</div> </div>
</div> </div>
<!--keep display awake configuration-->
<div class="wr-input-control">
<div class="wr-input-control sub-title panel-title"
style="padding: 0px; padding-right:15px; font-size:15px;">
Keep display awake
<span class="wr-help-tip glyphicon glyphicon-question-sign"
title="Keep display awake"></span>
<label class="wr-input-control checkbox">
<input id="cosu-global-config-keep-display-awake" type="checkbox"
class="form-control operationDataKeys cosu-profile-config"
data-key="keepDisplayAwake"/>
<span class="helper"></span>
</label>
</div>
</div>
<!--COSU profile user app configuration--> <!--COSU profile user app configuration-->
<div id="cosu-profile-user-app-configuration" class="panel"> <div id="cosu-profile-user-app-configuration" class="panel">
<div class="wr-input-control sub-title panel-title" <div class="wr-input-control sub-title panel-title"

15
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
Unescape View File

@ -1810,6 +1810,21 @@
</div> </div>
</div> </div>
</div> </div>
<!--keep display awake configuration-->
<div class="wr-input-control">
<div class="wr-input-control sub-title panel-title"
style="padding: 0px; padding-right:15px; font-size:15px;">
Keep display awake
<span class="wr-help-tip glyphicon glyphicon-question-sign"
title="Keep display awake"></span>
<label class="wr-input-control checkbox">
<input id="cosu-global-config-keep-display-awake" type="checkbox"
class="form-control operationDataKeys cosu-profile-config"
data-key="keepDisplayAwake" checked="checked"/>
<span class="helper"></span>
</label>
</div>
</div>
<!--COSU profile user app configuration--> <!--COSU profile user app configuration-->
<div id="cosu-profile-user-app-configuration" class="panel"> <div id="cosu-profile-user-app-configuration" class="panel">
<div class="wr-input-control sub-title panel-title" <div class="wr-input-control sub-title panel-title"

Write Preview
Loading…
Cancel
Save