Replacing tray with taskbar

Change-Id: I9e3b136f4cffa4079a2b58ec3d10b91dfed17563
Signed-off-by: Shivam Varshney/Core S/W Group /SRI-Delhi/Engineer/Samsung Electronics <shivam.v2@samsung.com>

diff --git a/include/common/home_mgr.h b/include/common/home_mgr.h
index 6625801..4000ea4 100755 (executable)
--- a/include/common/home_mgr.h
+++ b/include/common/home_mgr.h
@@ -22,7 +22,7 @@ extern int home_mgr_get_home_pid(void);
 extern int home_mgr_get_volume_pid(void);
 extern int home_mgr_get_indicator_pid(void);
 extern int home_mgr_get_quickpanel_pid(void);
-extern int home_mgr_get_tray_pid(void);
+extern int home_mgr_get_taskbar_pid(void);
 extern int home_mgr_get_softkey_pid(void);
 extern void home_mgr_softkey_dead_signal_received();
 
@@ -35,6 +35,6 @@ void home_mgr_relaunch_homescreen(void);
 void home_mgr_relaunch_volume(void);
 void home_mgr_relaunch_indicator(void);
 void home_mgr_relaunch_quickpanel(void);
-void home_mgr_relaunch_tray(void);
+void home_mgr_relaunch_taskbar(void);
 extern void home_mgr_open_home(const char *appid, const char *key, const char *val);
 // End of a file
\ No newline at end of file

diff --git a/include/common/hw_key.h b/include/common/hw_key.h
index e9e7c32..74d7c82 100755 (executable)
--- a/include/common/hw_key.h
+++ b/include/common/hw_key.h
@@ -58,7 +58,7 @@ typedef enum {
        KEY_REC,
        KEY_CANCEL,
        KEY_SOFTBD,
-       KEY_TRAY,
+       KEY_TASKBAR,
        KEY_QUICKPANEL,
        KEY_TASKSWITCH,
        KEY_HOMEPAGE,

diff --git a/include/mobile/home_mgr.h b/include/mobile/home_mgr.h
index 25f3b9e..3d90559 100755 (executable)
--- a/include/mobile/home_mgr.h
+++ b/include/mobile/home_mgr.h
@@ -22,7 +22,7 @@ extern int home_mgr_get_home_pid(void);
 extern int home_mgr_get_volume_pid(void);
 extern int home_mgr_get_indicator_pid(void);
 extern int home_mgr_get_quickpanel_pid(void);
-extern int home_mgr_get_tray_pid(void);
+extern int home_mgr_get_taskbar_pid(void);
 
 extern void home_mgr_init(void *data);
 extern void home_mgr_fini(void);
@@ -31,6 +31,6 @@ void home_mgr_relaunch_homescreen(void);
 void home_mgr_relaunch_volume(void);
 void home_mgr_relaunch_indicator(void);
 void home_mgr_relaunch_quickpanel(void);
-void home_mgr_relaunch_tray(void);
+void home_mgr_relaunch_taskbar(void);
 extern void home_mgr_open_home(const char *appid, const char *key, const char *val);
 // End of a file

diff --git a/include/mobile/hw_key.h b/include/mobile/hw_key.h
index e9e7c32..74d7c82 100755 (executable)
--- a/include/mobile/hw_key.h
+++ b/include/mobile/hw_key.h
@@ -58,7 +58,7 @@ typedef enum {
        KEY_REC,
        KEY_CANCEL,
        KEY_SOFTBD,
-       KEY_TRAY,
+       KEY_TASKBAR,
        KEY_QUICKPANEL,
        KEY_TASKSWITCH,
        KEY_HOMEPAGE,

diff --git a/include/wearable/hw_key.h b/include/wearable/hw_key.h
index bfea0ff..f669102 100755 (executable)
--- a/include/wearable/hw_key.h
+++ b/include/wearable/hw_key.h
@@ -38,7 +38,7 @@ typedef enum {
        KEY_REC,
        KEY_CANCEL,
        KEY_SOFTBD,
-       KEY_TRAY,
+       KEY_TASKBAR,
        KEY_QUICKPANEL,
        KEY_TASKSWITCH,
        KEY_HOMEPAGE,

diff --git a/src/common/home_mgr.c b/src/common/home_mgr.c
index faf1e33..1d75ff4 100755 (executable)
--- a/src/common/home_mgr.c
+++ b/src/common/home_mgr.c
@@ -45,7 +45,7 @@
 #define APPID_INDICATOR "org.tizen.indicator"
 #define APPID_QUICKPANEL "org.tizen.quickpanel"
 #define APPID_SOFTKEY "org.tizen.softkey-container"
-#define APPID_TRAY "org.tizen.TrayApplication"
+#define APPID_TASKBAR "org.tizen.taskbar"
 
 #define HOMESCREEN_NUI_PKG_NAME "org.tizen.homescreen-nui"
 
@@ -56,7 +56,7 @@ static struct {
        pid_t indicator_pid;
        pid_t quickpanel_pid;
        pid_t softkey_pid;
-       pid_t tray_pid;
+       pid_t taskbar_pid;
        int power_off;
 
        Ecore_Timer *dead_timer;
@@ -69,7 +69,7 @@ static struct {
        .indicator_pid = (pid_t)-1,
        .quickpanel_pid = (pid_t)-1,
        .softkey_pid = (pid_t)-1,
-       .tray_pid = (pid_t)-1,
+       .taskbar_pid = (pid_t)-1,
        .power_off = 0,
 
        .dead_timer = NULL,
@@ -107,9 +107,9 @@ int home_mgr_get_softkey_pid(void)
        return s_home_mgr.softkey_pid;
 }
 
-int home_mgr_get_tray_pid(void)
+int home_mgr_get_taskbar_pid(void)
 {
-       return s_home_mgr.tray_pid;
+       return s_home_mgr.taskbar_pid;
 }
 
 void home_mgr_softkey_dead_signal_received()
@@ -303,9 +303,9 @@ static void _after_launch_softkey(int pid)
        s_home_mgr.softkey_pid = pid;
 }
 
-static void _after_launch_tray(int pid)
+static void _after_launch_taskbar(int pid)
 {
-       s_home_mgr.tray_pid = pid;
+       s_home_mgr.taskbar_pid = pid;
 }
 
 static void _launch_after_home(int pid)
@@ -454,9 +454,9 @@ void home_mgr_relaunch_quickpanel(void)
        process_mgr_must_launch(APPID_QUICKPANEL, NULL, NULL, NULL, _after_launch_quickpanel);
 }
 
-void home_mgr_relaunch_tray(void)
+void home_mgr_relaunch_taskbar(void)
 {
-       process_mgr_must_launch(APPID_TRAY, NULL, NULL, NULL, _after_launch_tray);
+       process_mgr_must_launch(APPID_TASKBAR, NULL, NULL, NULL, _after_launch_taskbar);
 }
 
 void home_mgr_softkey_process_terminate(void)

diff --git a/src/common/hw_key.c b/src/common/hw_key.c
index 77de925..b6a6f40 100755 (executable)
--- a/src/common/hw_key.c
+++ b/src/common/hw_key.c
@@ -73,7 +73,7 @@ const char *key_name[KEY_NAME_MAX] = {
        "XF86AudioRecord",
        "Cancel",
        "XF86SoftKBD",
-       "XF86Tray",
+       "XF86Taskbar",
        "XF86QuickPanel",
        "XF86TaskPane",
        "XF86HomePage",

diff --git a/src/common/starter.c b/src/common/starter.c
index f24cc76..f3d37f2 100755 (executable)
--- a/src/common/starter.c
+++ b/src/common/starter.c
@@ -196,7 +196,7 @@ static int _check_dead_signal(int pid, void *data)
        int volume_pid = 0;
        int indicator_pid = 0;
        int quickpanel_pid = 0;
-       int tray_pid = 0;
+       int taskbar_pid = 0;
 #if LOCKSCREEN_ENABLE
        int lock_pid = 0;
 #endif
@@ -214,7 +214,7 @@ static int _check_dead_signal(int pid, void *data)
        volume_pid = home_mgr_get_volume_pid();
        indicator_pid = home_mgr_get_indicator_pid();
        quickpanel_pid = home_mgr_get_quickpanel_pid();
-       tray_pid = home_mgr_get_tray_pid();
+       taskbar_pid = home_mgr_get_taskbar_pid();
 #if LOCKSCREEN_ENABLE
        lock_pid = lock_mgr_get_lock_pid();
 #endif
@@ -241,13 +241,13 @@ static int _check_dead_signal(int pid, void *data)
        } else if (pid == quickpanel_pid) {
                _D("quickpanel is dead");
                home_mgr_relaunch_quickpanel();
-       } else if (pid == tray_pid) {
-               _D("tray is dead");
-               home_mgr_relaunch_tray();
+       } else if (pid == taskbar_pid) {
+               _D("taskbar is dead");
+               home_mgr_relaunch_taskbar();
        } else if (pid == oobe_setup_pid) {
                _D("oobe setup is dead");
                oobe_mgr_oobe_setup_terminated();
-               home_mgr_relaunch_tray();
+               home_mgr_relaunch_taskbar();
        } else if (pid == softkey_pid) {
                _D("softkey is dead");
                home_mgr_softkey_dead_signal_received();
@@ -319,7 +319,7 @@ static void _init(void)
        oobe_mgr_init();
        if( oobe_mgr_get_oobe_setup_pid() < 0)
        {
-               home_mgr_relaunch_tray();
+               home_mgr_relaunch_taskbar();
        }
        softkey_mgr_init();
 

diff --git a/src/mobile/home_mgr.c b/src/mobile/home_mgr.c
index 1e9d86e..73d193a 100755 (executable)
--- a/src/mobile/home_mgr.c
+++ b/src/mobile/home_mgr.c
@@ -38,7 +38,7 @@
 #define SYSPOPUPID_VOLUME "org.tizen.volume-nui"
 #define APPID_INDICATOR "org.tizen.indicator"
 #define APPID_QUICKPANEL "org.tizen.quickpanel"
-#define APPID_TRAY "org.tizen.TrayApplication"
+#define APPID_TASKBAR "org.tizen.taskbar"
 
 #define DEAD_TIMER_SEC 10.0
 #define DEAD_TIMER_COUNT_MAX 2
@@ -51,7 +51,7 @@ static struct {
        pid_t volume_pid;
        pid_t indicator_pid;
        pid_t quickpanel_pid;
-       pid_t tray_pid;
+       pid_t taskbar_pid;
        int power_off;
 
        Ecore_Timer *dead_timer;
@@ -63,7 +63,7 @@ static struct {
        .volume_pid = (pid_t)-1,
        .indicator_pid = (pid_t)-1,
        .quickpanel_pid = (pid_t)-1,
-       .tray_pid = (pid_t)-1,
+       .taskbar_pid = (pid_t)-1,
        .power_off = 0,
 
        .dead_timer = NULL,
@@ -101,9 +101,9 @@ int home_mgr_get_quickpanel_pid(void)
 
 
 
-int home_mgr_get_tray_pid(void)
+int home_mgr_get_taskbar_pid(void)
 {
-       return s_home_mgr.tray_pid;
+       return s_home_mgr.taskbar_pid;
 }
 
 
@@ -286,9 +286,9 @@ static void _after_launch_quickpanel(int pid)
 
 
 
-static void _after_launch_tray(int pid)
+static void _after_launch_taskbar(int pid)
 {
-       s_home_mgr.tray_pid = pid;
+       s_home_mgr.taskbar_pid = pid;
 }
 
 
@@ -440,9 +440,9 @@ void home_mgr_relaunch_quickpanel(void)
 
 
 
-void home_mgr_relaunch_tray(void)
+void home_mgr_relaunch_taskbar(void)
 {
-       process_mgr_must_launch(APPID_TRAY, NULL, NULL, NULL, _after_launch_tray);
+       process_mgr_must_launch(APPID_TASKBAR, NULL, NULL, NULL, _after_launch_taskbar);
 }
 
 
@@ -469,7 +469,7 @@ static Eina_Bool _launch_apps_idler_cb(void *data)
        process_mgr_must_syspopup_launch(SYSPOPUPID_VOLUME, NULL, NULL, NULL, _after_launch_volume);
        process_mgr_must_launch(APPID_INDICATOR, NULL, NULL, NULL, _after_launch_indicator);
        process_mgr_must_launch(APPID_QUICKPANEL, NULL, NULL, NULL, _after_launch_quickpanel);
-       process_mgr_must_launch(APPID_TRAY, NULL, NULL, NULL, _after_launch_tray);
+       process_mgr_must_launch(APPID_TASKBAR, NULL, NULL, NULL, _after_launch_taskbar);
 
        return ECORE_CALLBACK_CANCEL;
 }

diff --git a/src/mobile/hw_key.c b/src/mobile/hw_key.c
index 665f494..a2211c5 100755 (executable)
--- a/src/mobile/hw_key.c
+++ b/src/mobile/hw_key.c
@@ -86,7 +86,7 @@ const char *key_name[KEY_NAME_MAX] = {
        "XF86AudioRecord",
        "Cancel",
        "XF86SoftKBD",
-       "XF86Tray",
+       "XF86Taskbar",
        "XF86QuickPanel",
        "XF86TaskPane",
        "XF86HomePage",

diff --git a/src/mobile/starter.c b/src/mobile/starter.c
index 8fe2bb0..18a505e 100755 (executable)
--- a/src/mobile/starter.c
+++ b/src/mobile/starter.c
@@ -130,7 +130,7 @@ static int _check_dead_signal(int pid, void *data)
        int volume_pid = 0;
        int indicator_pid = 0;
        int quickpanel_pid = 0;
-       int tray_pid = 0;
+       int taskbar_pid = 0;
        int lock_pid = 0;
 
        _D("Process %d is termianted", pid);
@@ -147,7 +147,7 @@ static int _check_dead_signal(int pid, void *data)
        volume_pid = home_mgr_get_volume_pid();
        indicator_pid = home_mgr_get_indicator_pid();
        quickpanel_pid = home_mgr_get_quickpanel_pid();
-       tray_pid = home_mgr_get_tray_pid();
+       taskbar_pid = home_mgr_get_taskbar_pid();
        lock_pid = lock_mgr_get_lock_pid();
 
        if (pid == home_pid) {
@@ -162,9 +162,9 @@ static int _check_dead_signal(int pid, void *data)
        } else if (pid == quickpanel_pid) {
                _D("quickpanel is dead");
                home_mgr_relaunch_quickpanel();
-       } else if (pid == tray_pid) {
-               _D("tray is dead");
-               home_mgr_relaunch_tray();
+       } else if (pid == taskbar_pid) {
+               _D("taskbar is dead");
+               home_mgr_relaunch_taskbar();
        } else if (pid == lock_pid) {
                _D("lockscreen is dead");
                lock_mgr_unlock();

diff --git a/src/wearable/hw_key.c b/src/wearable/hw_key.c
index 9b331b4..6938950 100755 (executable)
--- a/src/wearable/hw_key.c
+++ b/src/wearable/hw_key.c
@@ -65,7 +65,7 @@ const char *key_name[KEY_NAME_MAX] = {
        "XF86AudioRecord",
        "Cancel",
        "XF86SoftKBD",
-       "XF86Tray",
+       "XF86Taskbar",
        "XF86QuickPanel",
        "XF86TaskPane",
        "XF86HomePage",