Remove checkbox from wearable popup UI

- Remove checkbox from wearable popup UI according to the UX guide
changes. It makes all "deny" answers in the wearable profile
to be interpreted as DENY_ONCE.

Change-Id: Iec327d411d206846ed291a33a56e8a3fb8ee3393
Signed-off-by: Yunjin Lee <yunjin-.lee@samsung.com>

diff --git a/src/notification-daemon/res/popup_custom.edc b/src/notification-daemon/res/popup_custom.edc
index f7b316f..3f4643b 100644 (file)
--- a/src/notification-daemon/res/popup_custom.edc
+++ b/src/notification-daemon/res/popup_custom.edc
@@ -45,24 +45,23 @@ group { name: "popup_checkview_internal"; //wearable
             scale: 1;
             type: SWALLOW;
             description { state: "default" 0.0;
-                min: 0 100;
-                max: -1 100;
-                rel1.relative: 0.0 0.0;
-                rel1.offset: 0 -70;
-                rel2.relative: 1.0 1.0;
-                rel2.to_y: "elm.swallow.end";
+                fixed: 1 0;
+                rel2 {
+                    relative: 1.0 0.0;
+                    to_y: "spacer_m";
+                }
             }
         }
-        part { name: "elm.swallow.end"; //checkbox
+        spacer { "spacer_m";
             scale: 1;
-            type: SWALLOW;
             desc { state: "default" 0.0;
-                rel1.relative: 0.0 1.0;
-                rel1.to_y: "elm.swallow.content";
-                rel2.relative: 1.0 0.0;
-                rel2.to_y: "elm.privilege_counter";
-                min: 20 20;
-                max: -1 100;
+                align: 0.0 1.0;
+                fixed: 0 1;
+                min: 0 60;
+                rel1 {
+                    relative: 1.0 1.0;
+                    to_y: "elm.swallow.content";
+                }
             }
         }
         part { name: "elm.privilege_counter";
@@ -71,7 +70,7 @@ group { name: "popup_checkview_internal"; //wearable
             desc { state: "default" 0.0;
                 visible: 1;
                 rel1.relative: 0.0 1.0;
-                rel1.to_y: "elm.swallow.end";
+                rel1.to_y: "spacer_m";
                 rel2.relative: 1.0 1.0;
                 min: 20 20;
                 max: -1 100;

diff --git a/src/notification-daemon/ui/PopupCheckWearable.h b/src/notification-daemon/ui/PopupCheckWearable.h
index 925796c..03bcf6a 100644 (file)
--- a/src/notification-daemon/ui/PopupCheckWearable.h
+++ b/src/notification-daemon/ui/PopupCheckWearable.h
@@ -46,7 +46,6 @@ public:
         PopupCheckWearable *popup = static_cast<PopupCheckWearable*>(data);
 
         Po::setLocale();
-        elm_object_text_set(popup->m_checkBox, Po::getCheckBoxMsg().c_str());
         elm_atspi_accessible_name_set(popup->m_allowButton, Po::getAllowButtonMsg().c_str());
         elm_atspi_accessible_name_set(popup->m_denyButton, Po::getDenyButtonMsg().c_str());
 
@@ -125,18 +124,6 @@ public:
         elm_object_part_content_set(m_layoutInner, "elm.swallow.content", m_content);
         evas_object_size_hint_align_set(m_content, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-        m_checkBox = elm_check_add(m_popup);
-        if (m_checkBox == nullptr) {
-            ALOGE("EFL : Failed to add checkbox");
-            throw Exception("Enlightenment failed");
-        }
-        elm_object_style_set(m_checkBox, "popup");
-        elm_object_text_set(m_checkBox, Po::getCheckBoxMsg().c_str());
-        elm_check_state_set(m_checkBox, EINA_FALSE);
-        evas_object_size_hint_align_set(m_checkBox, EVAS_HINT_FILL, 0.0);
-        elm_object_part_content_set(m_layoutInner, "elm.swallow.end", m_checkBox);
-        evas_object_show(m_checkBox);
-
         m_counter = elm_label_add(m_layoutInner);
         if (m_counter == nullptr) {
             ALOGE("EFL : Failed to add counter");