Generate application_x attributes 39/53639/9
authorTomasz Iwanek <t.iwanek@samsung.com>
Fri, 4 Dec 2015 14:04:56 +0000 (15:04 +0100)
committerTomasz Iwanek <t.iwanek@samsung.com>
Wed, 9 Dec 2015 15:45:08 +0000 (16:45 +0100)
application attributes:
 - uigadget,
 - process-pool,
 - submode,
 - submode-mainid,
 - indicatordisplay,
 - portrait-effectimage,
 - landscape-effectimage,
 - effectimage-type,
 - hwacceleration.

package attributes:
 - nodisplay-setting.

Requires: https://review.tizen.org/gerrit/53638

Change-Id: Idbf8f7d570914becc1a4145b1359abb700ee60fd

src/common/step/step_generate_xml.cc
src/tpk/step/step_parse.cc
src/wgt/step/step_parse.cc

index 565257a..2d99e33 100644 (file)
@@ -36,6 +36,30 @@ void WriteUIApplicationAttributes(
   if (app->launch_mode && strlen(app->launch_mode))
     xmlTextWriterWriteAttribute(writer, BAD_CAST "launch_mode",
         BAD_CAST app->launch_mode);
+  if (app->ui_gadget && strlen(app->ui_gadget))
+    xmlTextWriterWriteAttribute(writer, BAD_CAST "ui-gadget",
+        BAD_CAST app->ui_gadget);
+  if (app->submode && strlen(app->submode))
+    xmlTextWriterWriteAttribute(writer, BAD_CAST "submode",
+        BAD_CAST app->submode);
+  if (app->submode_mainid && strlen(app->submode_mainid))
+    xmlTextWriterWriteAttribute(writer, BAD_CAST "submode-mainid",
+        BAD_CAST app->submode_mainid);
+  if (app->indicatordisplay && strlen(app->indicatordisplay))
+    xmlTextWriterWriteAttribute(writer, BAD_CAST "indicatordisplay",
+        BAD_CAST app->indicatordisplay);
+  if (app->portraitimg && strlen(app->portraitimg))
+    xmlTextWriterWriteAttribute(writer, BAD_CAST "portrait-effectimage",
+        BAD_CAST app->portraitimg);
+  if (app->landscapeimg && strlen(app->landscapeimg))
+    xmlTextWriterWriteAttribute(writer, BAD_CAST "landscape-effectimage",
+        BAD_CAST app->landscapeimg);
+  if (app->effectimage_type && strlen(app->effectimage_type))
+    xmlTextWriterWriteAttribute(writer, BAD_CAST "effectimage-type",
+        BAD_CAST app->effectimage_type);
+  if (app->hwacceleration && strlen(app->hwacceleration))
+    xmlTextWriterWriteAttribute(writer, BAD_CAST "hwacceleration",
+        BAD_CAST app->hwacceleration);
 }
 
 void WriteServiceApplicationAttributes(
@@ -67,6 +91,9 @@ common_installer::Step::Status StepGenerateXml::GenerateApplicationCommonXml(
   else
     xmlTextWriterWriteAttribute(writer, BAD_CAST "type", BAD_CAST "capp");
 
+  if (app->process_pool && strlen(app->process_pool))
+    xmlTextWriterWriteAttribute(writer, BAD_CAST "process-pool",
+                                BAD_CAST app->process_pool);
   // app-specific attributes
   if (is_service)
     WriteServiceApplicationAttributes(writer, app);
@@ -239,6 +266,8 @@ common_installer::Step::Status StepGenerateXml::process() {
       BAD_CAST context_->manifest_data.get()->version);
   xmlTextWriterWriteAttribute(writer, BAD_CAST "api-version",
       BAD_CAST context_->manifest_data.get()->api_version);
+  xmlTextWriterWriteAttribute(writer, BAD_CAST "nodisplay-setting",
+      BAD_CAST context_->manifest_data.get()->nodisplay_setting);
 
   for (label_x* label :
        GListRange<label_x*>(context_->manifest_data.get()->label)) {
index bbe8104..024ec3e 100644 (file)
@@ -126,6 +126,7 @@ bool StepParse::FillPackageInfo(manifest_x* manifest) {
 
   manifest->ns = strdup(pkg_info->xmlns().c_str());
   manifest->package = strdup(pkg_info->package().c_str());
+  manifest->nodisplay_setting = strdup(pkg_info->nodisplay_setting().c_str());
   manifest->type = strdup("tpk");
   manifest->version = strdup(pkg_info->version().c_str());
   manifest->installlocation = strdup(pkg_info->install_location().c_str());
@@ -218,6 +219,9 @@ bool StepParse::FillServiceApplication(manifest_x* manifest) {
     service_app->exec = strdup(application.sa_info.exec().c_str());
     service_app->onboot = strdup(application.sa_info.on_boot().c_str());
     service_app->type = strdup(application.sa_info.type().c_str());
+    service_app->process_pool =
+        strdup(application.sa_info.process_pool().c_str());
+
     service_app->component_type = strdup("svcapp");
     manifest->application = g_list_append(manifest->application, service_app);
 
@@ -253,6 +257,21 @@ bool StepParse::FillUIApplication(manifest_x* manifest) {
     ui_app->taskmanage = strdup(application.ui_info.taskmanage().c_str());
     ui_app->type = strdup(application.ui_info.type().c_str());
     ui_app->component_type = strdup("uiapp");
+    ui_app->ui_gadget = strdup(application.ui_info.uigadget().c_str());
+    ui_app->process_pool = strdup(application.ui_info.process_pool().c_str());
+    ui_app->submode = strdup(application.ui_info.submode().c_str());
+    ui_app->indicatordisplay =
+        strdup(application.ui_info.indicator_display().c_str());
+    ui_app->effectimage_type =
+        strdup(application.ui_info.effectimage_type().c_str());
+    ui_app->portraitimg =
+        strdup(application.ui_info.portrait_image().c_str());
+    ui_app->landscapeimg =
+        strdup(application.ui_info.landscape_image().c_str());
+    ui_app->submode_mainid =
+        strdup(application.ui_info.submode_mainid().c_str());
+    ui_app->hwacceleration =
+        strdup(application.ui_info.hwacceleration().c_str());
     manifest->application = g_list_append(manifest->application, ui_app);
 
     if (!FillAppControl(ui_app, application.app_control))
index 4f0fafe..72d2812 100644 (file)
@@ -120,6 +120,7 @@ bool StepParse::FillWidgetInfo(manifest_x* manifest) {
   }
 
   manifest->type = strdup("wgt");
+  manifest->nodisplay_setting = strdup("false");
 
   // For wgt package use the long name
   for (auto& item : wgt_info->name_set()) {