Merge branch 'keepDisplay' into 'master'

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
commit 0d4623816f

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

@ -2241,6 +2241,21 @@
</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-->
<div id="cosu-profile-user-app-configuration" class="panel">
<div class="wr-input-control sub-title panel-title"

@ -1690,6 +1690,21 @@
</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-->
<div id="cosu-profile-user-app-configuration" class="panel">
<div class="wr-input-control sub-title panel-title"

@ -1810,6 +1810,21 @@
</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-->
<div id="cosu-profile-user-app-configuration" class="panel">
<div class="wr-input-control sub-title panel-title"

Loading…
Cancel
Save