[TIZENIOT-1297] - Remove voice control feature

[TIZENIOT-1298] - Change position buttons (noti settings, clear)

Change-Id: I5b0cee80de4a306eaf6e38d361d9be1931200e0f

diff --git a/inc/quickpanel-ui.h b/inc/quickpanel-ui.h
index 5ab922d356ca878cff405459fe082174435f7175..3ebd91a5cbf34f0db8d96f94e335329142cb431d 100755 (executable)
--- a/inc/quickpanel-ui.h
+++ b/inc/quickpanel-ui.h
@@ -60,7 +60,7 @@
 #endif
 
 #if !defined(QP_VOICE_CONTROL_ENABLE)
-       #define QP_VOICE_CONTROL_ENABLE
+       //#define QP_VOICE_CONTROL_ENABLE
 #endif
 
 /* EDJ theme */

diff --git a/res/edje/quickpanel_brightness.edc b/res/edje/quickpanel_brightness.edc
index 278b3c5f0385d8e0305bffb741b6059d7ffa8297..e78d7919ad0d6ec4da902aed15209ba947a680a3 100755 (executable)
--- a/res/edje/quickpanel_brightness.edc
+++ b/res/edje/quickpanel_brightness.edc
@@ -105,7 +105,7 @@
                                        max: 9999 QP_THEME_LIST_ITEM_BRIGHTNESS_HEIGHT;
                                        fixed: 1 1;
                                        rel1 {
-                                               relative: 0.0 0.0;
+                                               relative: 0.5 0.0;
                                        }
                                        rel2 {
                                                relative: 1.0 0.0;

diff --git a/res/edje/quickpanel_noti_section.edc b/res/edje/quickpanel_noti_section.edc
index cab64051c9733a81d9f0b5242e2b3b17996447e8..9399889dae01a308b30207d90148097c8dfdba2b 100755 (executable)
--- a/res/edje/quickpanel_noti_section.edc
+++ b/res/edje/quickpanel_noti_section.edc
@@ -428,7 +428,8 @@
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 17 0;
+                                       min: 850 0;
+                                       max: 850 0;
                                        fixed: 1 0;
                                        align: 0.0 0.0;
                                        rel1 {
@@ -536,12 +537,12 @@
 
                        part {
                                name: "rect.button.notisetting";
-                               type: IMAGE;
+                               type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 75 36;
-                                       max: 180 36;
+                                       min: 250 36;
+                                       max: 250 36;
                                        fixed: 1 1;
                                        rel1 {
                                                to_x: "notisection.padding.left";
@@ -552,18 +553,12 @@
                                                to_x: "separator.padding.left";
                                                to_y: "base";
                                        }
-
-                                       image {
-                                               normal:"core_icon_badge_container.#.png";
-                                       }
-                                       color_class: QP_CLEAR_ALL_CLEAR_ALL_BTN_BG_COLOR;
                                        align: 0.0 0.5;
                                }
                                description
                                {
                                        state: "pressed" 0.0;
                                        inherit: "default" 0.0;
-                                       color: 147 208 217 255;
                                }
                        }
 
@@ -585,7 +580,7 @@
                                                to: "rect.button.notisetting";
                                        }
 
-                                       color_class: QP_CLEAR_ALL_NOTIFICATIONS_LABEL_FONT_COLOR;
+                                       color:0 0 0 255;
                                        text {
                                                font: QP_CLEAR_ALL_NOTIFICATIONS_LABEL_FONT_NAME;
                                                size: QP_CLEAR_ALL_NOTIFICATIONS_LABEL_FONT_SIZE;
@@ -598,19 +593,16 @@
                                {
                                        state: "pressed";
                                        inherit: "default";
-                                       color_class: QP_CLEAR_ALL_NOTIFICATIONS_LABEL_FONT_COLOR_PRESSED;
                                }
                                description
                                {
                                        state: "disabled";
                                        inherit: "default";
-                                       color_class: QP_CLEAR_ALL_NOTIFICATIONS_LABEL_FONT_COLOR_DISABLED;
-
                                }
                        }
                        part {
                                name: "rect.button.clear_all";
-                               type: IMAGE;
+                               type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
@@ -625,11 +617,6 @@
                                                to_y: "underline";
                                                relative: 0.0 0.0;
                                        }
-
-                                       image {
-                                               normal:"core_icon_badge_container.#.png";
-                                       }
-                                       color_class: QP_CLEAR_ALL_CLEAR_ALL_BTN_BG_COLOR;
                                        align: 1.0 0.5;
                                        visible: 1;
                                }
@@ -638,14 +625,12 @@
                                {
                                        state: "pressed" 0.0;
                                        inherit: "default" 0.0;
-                                       color: 147 208 217 255;
                                }
 
                                description
                                {
                                        state: "disabled" 0.0;
                                        inherit: "default" 0.0;
-                                       color: 204 204 204 127;
                                }
 
                                description
@@ -675,7 +660,7 @@
                                                to: "notisection.padding.right";
                                                relative: 0.0 1.0;
                                        }
-                                       color_class: QP_CLEAR_ALL_CLEAR_ALL_BTN_FONT_COLOR;
+                                       color: 0 0 0 255;
                                        text {
                                                font: QP_CLEAR_ALL_CLEAR_ALL_BTN_TEXT_FONT_NAME;
                                                size: QP_CLEAR_ALL_CLEAR_ALL_BTN_FONT_SIZE;
@@ -689,13 +674,11 @@
                                {
                                        state: "pressed";
                                        inherit: "default";
-                                       color_class: QP_CLEAR_ALL_CLEAR_ALL_BTN_FONT_COLOR_PRESSED;
                                }
                                description
                                {
                                        state: "disabled";
                                        inherit: "default";
-                                       color_class: QP_CLEAR_ALL_CLEAR_ALL_BTN_FONT_COLOR_DIM;
                                }
 
                                description

diff --git a/res/po/en_US.po b/res/po/en_US.po
index 5893e16f366675c040bc65ac0e5381985109c0ea..f18715be4e4e4739ea8ba0d60138fb9640e160d3 100755 (executable)
--- a/res/po/en_US.po
+++ b/res/po/en_US.po
@@ -44,10 +44,10 @@ msgid "IDS_QP_TPOP_UNABLE_TO_OPEN_PS"
 msgstr "Unable to open %s."
 
 msgid "IDS_QP_ACBUTTON_NOTI_SETTINGS_ABB"
-msgstr "NOTI. SETTINGS"
+msgstr "Notifications Settings"
 
 msgid "IDS_LCKSCN_ACBUTTON_CLEAR_ALL"
-msgstr "CLEAR ALL"
+msgstr "Clear"
 
 msgid "IDS_QP_NPBODY_UNLOCK_SCREEN_TO_VIEW_CONTENT"
 msgstr "Unlock screen to view content"