From 0eb89ab39b3bcb63c92d8e4f0f6d134a6ce554b5 Mon Sep 17 00:00:00 2001 From: Rusty Lynch Date: Tue, 29 Oct 2013 12:56:34 -0700 Subject: [PATCH] Remove the mobile specific indicator The mobile UI contains space for a general indicator toolbar which is not needed for ivi. Change-Id: I3d276efe7c5bc77e94e76b16072cca3a03259693 Signed-off-by: Rusty Lynch --- themes/inc/tizen-dark-inc.edc | 2 +- themes/inc/tizen-light-inc.edc | 2 +- themes/widgets/conformant.edc | 67 ------------------------------------------ 3 files changed, 2 insertions(+), 69 deletions(-) diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 9cd7c84..27f972b 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -23,7 +23,7 @@ #define LAYOUT_BG_COLOR_INC 0 0 0 255 #define LAYOUT_EDIT_MODE_BG_COLOR_INC 0 0 0 255 #define LAYOUT_GROUP_LIST_BG_COLOR_INC 0 0 0 255 -#define LAYOUT_INDICATOR_HEIGHT_INC 60 +#define LAYOUT_INDICATOR_HEIGHT_INC 0 #define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255 #define NAVIFRAME_TITLE_TEXT_BG_H_INC 88 diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index 86b6de5..b3de23e 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -23,7 +23,7 @@ #define LAYOUT_BG_COLOR_INC 248 246 239 255 #define LAYOUT_EDIT_MODE_BG_COLOR_INC 248 246 239 255 #define LAYOUT_GROUP_LIST_BG_COLOR_INC 248 246 239 255 -#define LAYOUT_INDICATOR_HEIGHT_INC 60 +#define LAYOUT_INDICATOR_HEIGHT_INC 0 #define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255 #define NAVIFRAME_TITLE_TEXT_BG_H_INC 88 diff --git a/themes/widgets/conformant.edc b/themes/widgets/conformant.edc index d1297b0..0c15d6e 100644 --- a/themes/widgets/conformant.edc +++ b/themes/widgets/conformant.edc @@ -176,28 +176,6 @@ } programs { program { - name: "show_indicator"; //show indicator using effect - signal: "elm,state,indicator,show"; - source: "elm"; - script { - set_int(indicator_visible, 1); - set_state(PART:"indicator_base", "default", 0.0); - //it is possible app call show after opacity call - /////Portrait - if (get_int(landscape) == 0) { - if (get_int(indicator_opacity) == 0) - run_program(PROGRAM:"opaque_state"); - if (get_int(indicator_opacity) == 1) - run_program(PROGRAM:"translucent_state"); - if (get_int(indicator_opacity) == 2) - run_program(PROGRAM:"transparent_state"); - } - /////Landscape - else - run_program(PROGRAM:"transparent_state"); - } - } - program { name: "hide_indicator"; signal: "elm,state,indicator,hide"; source: "elm"; @@ -540,21 +518,6 @@ } programs { program { - name: "show_indicator"; - signal: "elm,state,indicator,show"; - source: "elm"; - script { - set_int(indicator_visible, 1); - set_state(PART:"elm.swallow.indicator", "default", 0.0); - if (get_int(indicator_opacity) == 0) - set_state(PART:"indicator_bg", "opaque", 0.0); - if (get_int(indicator_opacity) == 1) - set_state(PART:"indicator_bg", "translucent", 0.0); - if (get_int(indicator_opacity) == 2) - set_state(PART:"indicator_bg", "transparent", 0.0); - } - } - program { name: "hide_indicator"; signal: "elm,state,indicator,hide"; source: "elm"; @@ -693,21 +656,6 @@ } programs { program { - name: "show_indicator"; - signal: "elm,state,indicator,show"; - source: "elm"; - script { - set_int(indicator_visible, 1); - set_state(PART:"elm.swallow.indicator", "default", 0.0); - if (get_int(indicator_opacity) == 0) - set_state(PART:"indicator_bg", "opaque", 0.0); - if (get_int(indicator_opacity) == 1) - set_state(PART:"indicator_bg", "translucent", 0.0); - if (get_int(indicator_opacity) == 2) - set_state(PART:"indicator_bg", "transparent", 0.0); - } - } - program { name: "hide_indicator"; signal: "elm,state,indicator,hide"; source: "elm"; @@ -833,21 +781,6 @@ } programs { program { - name: "show_indicator"; - signal: "elm,state,indicator,show"; - source: "elm"; - script { - set_int(indicator_visible, 1); - set_state(PART:"elm.swallow.indicator", "default", 0.0); - if (get_int(indicator_opacity) == 0) - set_state(PART:"indicator_bg", "opaque", 0.0); - if (get_int(indicator_opacity) == 1) - set_state(PART:"indicator_bg", "translucent", 0.0); - if (get_int(indicator_opacity) == 2) - set_state(PART:"indicator_bg", "transparent", 0.0); - } - } - program { name: "hide_indicator"; signal: "elm,state,indicator,hide"; source: "elm"; -- 2.7.4