[W-Indicator] Add battery percentage info

Change-Id: I66e816787e5c341f0207fb56450490e911745b94

diff --git a/data/edje/images/b_moment_bar_detail_bg.png b/data/edje/images/b_moment_bar_detail_bg.png
index 9ae4ef3c1d9ab1489ffa4ca9c27a149e88bcbad6..1df9d47db0a8be4398869c8c39a5a06abbf89537 100644 (file)
Binary files a/data/edje/images/b_moment_bar_detail_bg.png and b/data/edje/images/b_moment_bar_detail_bg.png differ

diff --git a/data/edje/images/b_moment_more_opt_bar1.png b/data/edje/images/b_moment_more_opt_bar1.png
deleted file mode 100644 (file)
index b66a26e..0000000
Binary files a/data/edje/images/b_moment_more_opt_bar1.png and /dev/null differ

diff --git a/data/edje/images/donotdisturb.png b/data/edje/images/donotdisturb.png
deleted file mode 100644 (file)
index 138abe1..0000000
Binary files a/data/edje/images/donotdisturb.png and /dev/null differ

diff --git a/data/edje/images/no_signal.png b/data/edje/images/no_signal.png
deleted file mode 100644 (file)
index 30a11c7..0000000
Binary files a/data/edje/images/no_signal.png and /dev/null differ

diff --git a/data/edje/windicator_battery_icon.edc b/data/edje/windicator_battery_icon.edc
index b72d2fdb940df2d29f71de8b7efc672bd809f9cc..561b3846511a548a46f3037d97c78654f460b9fd 100644 (file)
--- a/data/edje/windicator_battery_icon.edc
+++ b/data/edje/windicator_battery_icon.edc
@@ -15,13 +15,7 @@
  * limitations under the License.
  */
 
-#if (NETWORK_ATT == 1)
-#define BATTERY_DIR_PREFIX "Battery/ATT"
-#elif (NETWORK_VERIZON == 1) || (NETWORK_SPRINT == 1) || (NETWORK_TMB == 1)
-#define BATTERY_DIR_PREFIX "Battery/VRW_SPR_TMO"
-#else
 #define BATTERY_DIR_PREFIX "battery"
-#endif
 
 #define DESCRIPTION_BATTERY(num)\
        description {\
@@ -114,32 +108,7 @@ group {
                                inherit: "default" 0.0;
                                visible: 0;
                        }
-                       /* Verizon, ATT */
-                       description {
-                               state : "Red4";
-                               inherit: "default" 0.0;
-                               color_class : "AO018L2";
-                               image.normal : BATTERY_DIR_PREFIX"/battery_00.png";
-                       }
-                       description {
-                               state : "Red10";
-                               inherit: "default" 0.0;
-                               color_class : "AO018L2";
-                               image.normal : BATTERY_DIR_PREFIX"/battery_10.png";
-                       }
-                       description {
-                               state : "Yellow15";
-                               inherit: "default" 0.0;
-                               color_class : "AO018L3";
-                               image.normal : BATTERY_DIR_PREFIX"/battery_15.png";
-                       }
-                       description {
-                               state : "Yellow20";
-                               inherit: "default" 0.0;
-                               color_class : "AO018L3";
-                               image.normal : BATTERY_DIR_PREFIX"/battery_20.png";
-                       }
-                       DESCRIPTION_BATTERY(00);
+
                        DESCRIPTION_BATTERY(05);
                        DESCRIPTION_BATTERY(10);
                        DESCRIPTION_BATTERY(15);
@@ -161,7 +130,6 @@ group {
                        DESCRIPTION_BATTERY(95);
                        DESCRIPTION_BATTERY(100);
 
-                       DESCRIPTION_CHARGING_BATTERY(00);
                        DESCRIPTION_CHARGING_BATTERY(05);
                        DESCRIPTION_CHARGING_BATTERY(10);
                        DESCRIPTION_CHARGING_BATTERY(15);
@@ -193,6 +161,7 @@ group {
                                max: BATTERY_ICON_WIDTH BATTERY_ICON_HEIGHT;
                                fixed: 1 1;
                                visible: 0;
+                               //visible: 1;
                                color_class: "AO019L1";
                                image.normal : BATTERY_DIR_PREFIX"/battery_charge.png";
                        }
@@ -202,6 +171,27 @@ group {
                                visible: 1;
                        }
                }
+               part {
+                       name : "txt.battery";
+                       type : TEXTBLOCK;
+                       scale : 1;
+                       description{
+                               state : "default" 0.0;
+                               visible : 1;
+                               min : 300 22;
+                               max : 300 22;
+                               fixed : 1 1;
+                               align : 0.5 0.0;
+                               rel1 { relative : 0.5 1.0; to : "img.battery.charge"; }
+                               rel2 { relative : 0.5 1.0; to : "img.battery.charge"; }
+                               text {
+                                       style : "style_txt_battery";
+                                       align : 0.5 0.5;
+                                       min : 1 1;
+                                       text : "50%";
+                               }
+                       }
+               }
        }
 
        programs {
@@ -241,7 +231,7 @@ group {
                        action : STATE_SET "Yellow20" 0.0;
                        target : "img.battery";
                }
-               PROGRAM_BATTERY(00);
+
                PROGRAM_BATTERY(05);
                PROGRAM_BATTERY(10);
                PROGRAM_BATTERY(15);
@@ -263,7 +253,6 @@ group {
                PROGRAM_BATTERY(95);
                PROGRAM_BATTERY(100);
 
-               PROGRAM_CHARGING_BATTERY(00);
                PROGRAM_CHARGING_BATTERY(05);
                PROGRAM_CHARGING_BATTERY(10);
                PROGRAM_CHARGING_BATTERY(15);

diff --git a/data/edje/windicator_moment_view.edc b/data/edje/windicator_moment_view.edc
index 6b30baa504edf23b43c4327451fc55da06de6568..8037bcb68ab693c5344f4f1b3a62060b93bf6b17 100644 (file)
--- a/data/edje/windicator_moment_view.edc
+++ b/data/edje/windicator_moment_view.edc
@@ -15,48 +15,16 @@
  * limitations under the License.
  */
 
- #define DESCRIPTION_BATTERY_LEVEL_BG(name)\
-       description {\
-               state : "state_"name;\
-               inherit : "default" 0.0;\
-               visible: 1;\
-               image.normal : "Charging/Charging_21/battery_charging_"name".png";\
-       }\
-
-#define PROGRAM_BATTERY_LEVEL(num)\
-       program {\
-               name : "bg_level_"num;\
-               signal : "bg_level_"num;\
-               source : "image.bg";\
-               action : STATE_SET "state_"num 0.0;\
-               target : "image.bg";\
-       }\
-
- #define DESCRIPTION_BATTERY_NUMBER(name)\
-       description {\
-               state : "state_"name;\
-               inherit : "default" 0.0;\
-               visible: 1;\
-               image.normal : "Charging/battery_charging_number_"name".png";\
-       }\
-
-#define PROGRAM_BATTERY_NUMBER1(num)\
-       program {\
-               name : "number1_"num;\
-               signal : "number1_"num;\
-               source : "image.number.1";\
-               action : STATE_SET "state_"num 0.0;\
-               target : "image.number.1";\
-       }\
-
-#define PROGRAM_BATTERY_NUMBER2(num)\
-       program {\
-               name : "number2_"num;\
-               signal : "number2_"num;\
-               source : "image.number.2";\
-               action : STATE_SET "state_"num 0.0;\
-               target : "image.number.2";\
-       }\
+styles {
+       style {
+               name: "style_txt_battery";
+               base: "font=Tizen:style=Regular font_size=22 align=center color=#ffffffff color_class=AT01111 wrap=mixed text_class=AT01111";
+               tag: "br" "\n";
+               tag: "hilight" "+ color=#ffff";
+               tag: "b" "+ color=#ffff";
+               tag: "tab" "\t";
+       }
+}
 
 group {
        name : "windicator/moment_view/full";
@@ -108,55 +76,6 @@ group {
                                rel2 { relative : 1.0 1.0-0.72; to : "bg"; }
                        }
                }
-#if 0
-               part {
-                       name : "bg";
-                       type : RECT;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : WIN_WIDTH WIN_HEIGHT;
-                               max : WIN_WIDTH WIN_HEIGHT;
-                               fixed : 1 1;
-//                             color_class : "AO015";
-                               color : 0 0 0 0;
-                       }
-               }
-               part {
-                       name : "image.momentview.middle";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : WIN_WIDTH WIN_HEIGHT;
-                               max : WIN_WIDTH WIN_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               visible : 1;
-//                             image.normal: "view_over_middle.png";
-                               color_class : "AO029L2";
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }
-               }
-               part {
-                       name : "image.momentview.top";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : WIN_WIDTH WIN_HEIGHT;
-                               max : WIN_WIDTH WIN_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               visible : 1;
-//                             image.normal: "view_over_top.png";
-                               color_class : "AO029L1";
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }
-               }
-#endif
                part {
                        name : "sw.dynamic";
                        type : SWALLOW;
@@ -174,11 +93,10 @@ group {
        }
 }
 
-#if 0
 group {
        name : "windicator/moment_view/battery";
        images {
-               image : "power_on_charging_icon.png" COMP;
+               image : "battery/battery_charge.png" COMP;
        }
        parts {
                part {
@@ -210,8 +128,8 @@ group {
                }
                part {
                        name : "image.momentview.charging";
-//                     type : IMAGE;
-                       type : SWALLOW;
+                       type : IMAGE;
+                       //type : SWALLOW;
                        scale : 1;
                        description {
                                state : "default" 0.0;
@@ -220,7 +138,7 @@ group {
                                fixed : 1 1;
                                align : 0.5 0.0;
                                visible : 1;
-//                             image.normal: "power_on_charging_icon.png";
+                               image.normal: "battery/battery_charge.png";
                                rel1 { relative : 0.5 126/360; to : "bg"; }
                                rel2 { relative : 0.5 126/360; to : "bg"; }
                        }
@@ -232,8 +150,8 @@ group {
                }
                part {
                        name : "txt.momentview.battery";
-//                     type : TEXTBLOCK;
-                       type : SWALLOW;
+                       type : TEXTBLOCK;
+//                     type : SWALLOW;
                        scale : 1;
                        description{
                                state : "default" 0.0;
@@ -243,486 +161,13 @@ group {
                                fixed : 1 1;
                                rel1 { relative : 0.5 0.5; to : "bg"; offset: 0 12;}
                                rel2 { relative : 0.5 0.5; to : "bg"; offset: 0 12;}
-/*                             text {
-                                       style : "style_battery";
+                               text {
+                                       style : "style_txt_battery";
                                        min : 1 1;
                                        align : 0.5 0.5;
-                                       text : "0%";
-                               }*/
-                       }
-               }
-       }
-}
-#endif
-group {
-       name : "windicator/moment_view/battery";
-       images {
-               image : "Charging/battery_charging_number_0.png" COMP;
-               image : "Charging/battery_charging_number_1.png" COMP;
-               image : "Charging/battery_charging_number_2.png" COMP;
-               image : "Charging/battery_charging_number_3.png" COMP;
-               image : "Charging/battery_charging_number_4.png" COMP;
-               image : "Charging/battery_charging_number_5.png" COMP;
-               image : "Charging/battery_charging_number_6.png" COMP;
-               image : "Charging/battery_charging_number_7.png" COMP;
-               image : "Charging/battery_charging_number_8.png" COMP;
-               image : "Charging/battery_charging_number_9.png" COMP;
-               image : "Charging/battery_charging_number_percent.png" COMP;
-               image : "Charging/battery_wireless_charging_icon.png" COMP;
-               image : "Charging/Charging_21/battery_charging_0.png" COMP;
-               image : "Charging/Charging_21/battery_charging_5.png" COMP;
-               image : "Charging/Charging_21/battery_charging_10.png" COMP;
-               image : "Charging/Charging_21/battery_charging_15.png" COMP;
-               image : "Charging/Charging_21/battery_charging_20.png" COMP;
-               image : "Charging/Charging_21/battery_charging_25.png" COMP;
-               image : "Charging/Charging_21/battery_charging_30.png" COMP;
-               image : "Charging/Charging_21/battery_charging_35.png" COMP;
-               image : "Charging/Charging_21/battery_charging_40.png" COMP;
-               image : "Charging/Charging_21/battery_charging_45.png" COMP;
-               image : "Charging/Charging_21/battery_charging_50.png" COMP;
-               image : "Charging/Charging_21/battery_charging_55.png" COMP;
-               image : "Charging/Charging_21/battery_charging_60.png" COMP;
-               image : "Charging/Charging_21/battery_charging_65.png" COMP;
-               image : "Charging/Charging_21/battery_charging_70.png" COMP;
-               image : "Charging/Charging_21/battery_charging_75.png" COMP;
-               image : "Charging/Charging_21/battery_charging_80.png" COMP;
-               image : "Charging/Charging_21/battery_charging_85.png" COMP;
-               image : "Charging/Charging_21/battery_charging_90.png" COMP;
-               image : "Charging/Charging_21/battery_charging_95.png" COMP;
-               image : "Charging/Charging_21/battery_charging_100.png" COMP;
-       }
-       parts {
-               part {
-                       name : "bg";
-                       type : RECT;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : WIN_WIDTH WIN_HEIGHT;
-                               max : WIN_WIDTH WIN_HEIGHT;
-                               fixed : 1 1;
-                               color : 0 0 0 0;
-                       }
-               }
-               part {
-                       name : "image.bg";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               visible : 1;
-                               image.normal: "Charging/Charging_21/battery_charging_0.png";
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 1.0 1.0; to : "bg"; }
-                       }
-                       DESCRIPTION_BATTERY_LEVEL_BG(0);
-                       DESCRIPTION_BATTERY_LEVEL_BG(5);
-                       DESCRIPTION_BATTERY_LEVEL_BG(10);
-                       DESCRIPTION_BATTERY_LEVEL_BG(15);
-                       DESCRIPTION_BATTERY_LEVEL_BG(20);
-                       DESCRIPTION_BATTERY_LEVEL_BG(25);
-                       DESCRIPTION_BATTERY_LEVEL_BG(30);
-                       DESCRIPTION_BATTERY_LEVEL_BG(35);
-                       DESCRIPTION_BATTERY_LEVEL_BG(40);
-                       DESCRIPTION_BATTERY_LEVEL_BG(45);
-                       DESCRIPTION_BATTERY_LEVEL_BG(50);
-                       DESCRIPTION_BATTERY_LEVEL_BG(55);
-                       DESCRIPTION_BATTERY_LEVEL_BG(60);
-                       DESCRIPTION_BATTERY_LEVEL_BG(65);
-                       DESCRIPTION_BATTERY_LEVEL_BG(70);
-                       DESCRIPTION_BATTERY_LEVEL_BG(75);
-                       DESCRIPTION_BATTERY_LEVEL_BG(80);
-                       DESCRIPTION_BATTERY_LEVEL_BG(85);
-                       DESCRIPTION_BATTERY_LEVEL_BG(90);
-                       DESCRIPTION_BATTERY_LEVEL_BG(95);
-                       DESCRIPTION_BATTERY_LEVEL_BG(100);
-               }
-               part {
-                       name : "image.bg.charging";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : 60 60;
-                               max : 60 60;
-                               fixed : 1 1;
-                               visible : 1;
-                               image.normal: "Charging/battery_wireless_charging_icon.png";
-//                             rel1.relative : 0.5 (54)/360;
-//                             rel2.relative : 0.5 (54)/360;
-                               align : 0.5 0.0;
-                               rel1 { relative : 0.5 0.0; to : "bg"; offset: 0 54; }
-                               rel2 { relative : 0.5 0.0; to : "bg"; offset: 0 54; }
-                       }
-                       description {
-                               state : "hide" 0.0;
-                               inherit : "default" 0.0;
-                               visible : 0;
-                       }
-               }
-               part {
-                       name : "image.number.swallow";
-                       type : SWALLOW;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : 44 65;
-                               max : 44 65;
-                               fixed : 1 1;
-                               visible : 1;
-                               rel1.relative : 0.5 0.1;
-                               rel2.relative : 0.5 0.5;
-                       }
-                       description {
-                               state : "1number" 0.0;
-                               inherit : "default" 0.0;
-                               min : 44 65;
-                               max : 44 65;
-                               visible : 1;
-                       }
-                       description {
-                               state : "2number" 0.0;
-                               inherit : "default" 0.0;
-                               min : 88 65;
-                               max : 88 65;
-                               visible : 1;
-                       }
-                       description {
-                               state : "3number" 0.0;
-                               inherit : "default" 0.0;
-                               min : 88+44 65;
-                               max : 88+44 65;
-                               visible : 1;
-                       }
-               }
-               part {
-                       name : "test";
-                       type : RECT;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               color : 255 0 0 125;
-                               visible : 0;
-                               rel1 { relative : 0.0 0.0; to : "image.number.swallow";}
-                               rel2 { relative : 1.0 1.0; to : "image.number.swallow"; }
-                       }
-               }
-
-               part {
-                       name : "image.bg.percent";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : 38 65;
-                               max : 38 65;
-                               fixed : 1 1;
-                               visible : 1;
-                               image.normal: "Charging/battery_charging_number_percent.png";
-                               align : 0.0 0.5;
-                               rel1 { relative : 1.0 0.0; to : "image.number.swallow";}
-                               rel2 { relative : 1.0 1.0; to : "image.number.swallow"; }
+                                       text : "50%";
+                               }
                        }
                }
        }
-       programs
-       {
-               PROGRAM_BATTERY_LEVEL(0);
-               PROGRAM_BATTERY_LEVEL(5);
-               PROGRAM_BATTERY_LEVEL(10);
-               PROGRAM_BATTERY_LEVEL(15);
-               PROGRAM_BATTERY_LEVEL(20);
-               PROGRAM_BATTERY_LEVEL(25);
-               PROGRAM_BATTERY_LEVEL(30);
-               PROGRAM_BATTERY_LEVEL(35);
-               PROGRAM_BATTERY_LEVEL(40);
-               PROGRAM_BATTERY_LEVEL(45);
-               PROGRAM_BATTERY_LEVEL(50);
-               PROGRAM_BATTERY_LEVEL(55);
-               PROGRAM_BATTERY_LEVEL(60);
-               PROGRAM_BATTERY_LEVEL(65);
-               PROGRAM_BATTERY_LEVEL(70);
-               PROGRAM_BATTERY_LEVEL(75);
-               PROGRAM_BATTERY_LEVEL(80);
-               PROGRAM_BATTERY_LEVEL(85);
-               PROGRAM_BATTERY_LEVEL(90);
-               PROGRAM_BATTERY_LEVEL(95);
-               PROGRAM_BATTERY_LEVEL(100);
-               program {
-                       name : "number.set.1";
-                       signal : "number.set.1";
-                       source : "image.number.swallow";
-                       action : STATE_SET "1number" 0.0;
-                       target : "image.number.swallow";
-               }
-               program {
-                       name : "number.set.2";
-                       signal : "number.set.2";
-                       source : "image.number.swallow";
-                       action : STATE_SET "2number" 0.0;
-                       target : "image.number.swallow";
-               }
-               program {
-                       name : "number.set.3";
-                       signal : "number.set.3";
-                       source : "image.number.swallow";
-                       action : STATE_SET "3number" 0.0;
-                       target : "image.number.swallow";
-               }
-               program {
-                       name : "image.bg.charging.show";
-                       signal : "image.bg.charging.show";
-                       source : "image.bg.charging";
-                       action : STATE_SET "default" 0.0;
-                       target : "image.bg.charging";
-               }
-               program {
-                       name : "image.bg.charging.hide";
-                       signal : "image.bg.charging.hide";
-                       source : "image.bg.charging";
-                       action : STATE_SET "hide" 0.0;
-                       target : "image.bg.charging";
-               }
-
-       }
 }
-group {
-       name : "windicator/moment_view/battery/number";
-       images {
-               image : "Charging/battery_charging_number_0.png" COMP;
-               image : "Charging/battery_charging_number_1.png" COMP;
-               image : "Charging/battery_charging_number_2.png" COMP;
-               image : "Charging/battery_charging_number_3.png" COMP;
-               image : "Charging/battery_charging_number_4.png" COMP;
-               image : "Charging/battery_charging_number_5.png" COMP;
-               image : "Charging/battery_charging_number_6.png" COMP;
-               image : "Charging/battery_charging_number_7.png" COMP;
-               image : "Charging/battery_charging_number_8.png" COMP;
-               image : "Charging/battery_charging_number_9.png" COMP;
-               image : "Charging/battery_charging_number_percent.png" COMP;
-               image : "Charging/battery_wireless_charging_icon.png" COMP;
-       }
-       parts {
-               part {
-                       name : "bg";
-                       type : RECT;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : 44 65;
-                               max : 44 65;
-                               color : 0 0 0 0;
-                       }
-                       description {
-                               state : "1number" 0.0;
-                               inherit : "default" 0.0;
-                               min : 44 65;
-                               max : 44 65;
-                               visible : 1;
-                       }
-                       description {
-                               state : "2number" 0.0;
-                               inherit : "default" 0.0;
-                               min : 88 65;
-                               max : 88 65;
-                               visible : 1;
-                       }
-                       description {
-                               state : "3number" 0.0;
-                               inherit : "default" 0.0;
-                               min : 88+44 65;
-                               max : 88+44 65;
-                               visible : 1;
-                       }
-               }
-
-               part {
-                       name : "image.number.1";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               visible : 1;
-                               min : 44 65;
-                               max : 44 65;
-                               fixed : 1 1;
-                               image.normal: "Charging/battery_charging_number_0.png";
-                               align :1.0.0 0.5;
-                               rel1 { relative : 0.0 0.0; to : "image.number.2"; }
-                               rel2 { relative : 0.0 1.0; to : "image.number.2"; }
-                       }
-                       DESCRIPTION_BATTERY_NUMBER(0);
-                       DESCRIPTION_BATTERY_NUMBER(1);
-                       DESCRIPTION_BATTERY_NUMBER(2);
-                       DESCRIPTION_BATTERY_NUMBER(3);
-                       DESCRIPTION_BATTERY_NUMBER(4);
-                       DESCRIPTION_BATTERY_NUMBER(5);
-                       DESCRIPTION_BATTERY_NUMBER(6);
-                       DESCRIPTION_BATTERY_NUMBER(7);
-                       DESCRIPTION_BATTERY_NUMBER(8);
-                       DESCRIPTION_BATTERY_NUMBER(9);
-                       description {
-                               state : "hide" 0.0;
-                               inherit : "default" 0.0;
-                               min : 0 65;
-                               max : 0 65;
-                               visible: 0;
-                       }
-               }
-               part {
-                       name : "image.number.2";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               visible : 1;
-                               min : 44 65;
-                               max : 44 65;
-                               fixed : 1 1;
-                               image.normal: "Charging/battery_charging_number_0.png";
-                               align : 1.0 0.5;
-                               rel1 { relative : 1.0 0.0; to : "bg"; }
-                               rel2 { relative : 1.0 1.0; to : "bg"; }
-                       }
-                       DESCRIPTION_BATTERY_NUMBER(0);
-                       DESCRIPTION_BATTERY_NUMBER(1);
-                       DESCRIPTION_BATTERY_NUMBER(2);
-                       DESCRIPTION_BATTERY_NUMBER(3);
-                       DESCRIPTION_BATTERY_NUMBER(4);
-                       DESCRIPTION_BATTERY_NUMBER(5);
-                       DESCRIPTION_BATTERY_NUMBER(6);
-                       DESCRIPTION_BATTERY_NUMBER(7);
-                       DESCRIPTION_BATTERY_NUMBER(8);
-                       DESCRIPTION_BATTERY_NUMBER(9);
-                       description {
-                               state : "hide" 0.0;
-                               inherit : "default" 0.0;
-                               min : 0 65;
-                               max : 0 65;
-                               visible: 0;
-                       }
-               }
-               part {
-                       name : "image.number.0";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               visible : 1;
-                               min : 44 65;
-                               max : 44 65;
-                               fixed : 1 1;
-                               image.normal: "Charging/battery_charging_number_1.png";
-                               align : 1.0 0.5;
-                               rel1 { relative : 0.0 0.0; to : "image.number.1"; }
-                               rel2 { relative : 0.0 1.0; to : "image.number.1"; }
-                       }
-                       description {
-                               state : "hide" 0.0;
-                               inherit : "default" 0.0;
-                               min : 0 0;
-                               max : 0 0;
-                               visible: 1;
-                       }
-               }
-               part {
-                       name : "test";
-                       type : RECT;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               visible : 0;
-                               color : 0 255 0 125;
-                               rel1 { relative : 0.0 0.0; to : "image.number.0";}
-                               rel2 { relative : 1.0 1.0; to : "image.number.0"; }
-                       }
-               }
-               part {
-                       name : "test2";
-                       type : RECT;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               visible : 0;
-                               color : 0 0 255 125;
-                               rel1 { relative : 0.0 0.0; to : "bg";}
-                               rel2 { relative : 1.0 1.0; to : "bg"; }
-                       }
-               }
-       }
-       programs
-       {
-               program {
-                       name : "number1_hide";
-                       signal : "number1_hide";
-                       source : "image.number.1";
-                       action : STATE_SET "hide" 0.0;
-                       target : "image.number.1";
-               }
-               PROGRAM_BATTERY_NUMBER1(0);
-               PROGRAM_BATTERY_NUMBER1(1);
-               PROGRAM_BATTERY_NUMBER1(2);
-               PROGRAM_BATTERY_NUMBER1(3);
-               PROGRAM_BATTERY_NUMBER1(4);
-               PROGRAM_BATTERY_NUMBER1(5);
-               PROGRAM_BATTERY_NUMBER1(6);
-               PROGRAM_BATTERY_NUMBER1(7);
-               PROGRAM_BATTERY_NUMBER1(8);
-               PROGRAM_BATTERY_NUMBER1(9);
-               program {
-                       name : "number2_hide";
-                       signal : "number2_hide";
-                       source : "image.number.2";
-                       action : STATE_SET "hide" 0.0;
-                       target : "image.number.2";
-               }
-               PROGRAM_BATTERY_NUMBER2(0);
-               PROGRAM_BATTERY_NUMBER2(1);
-               PROGRAM_BATTERY_NUMBER2(2);
-               PROGRAM_BATTERY_NUMBER2(3);
-               PROGRAM_BATTERY_NUMBER2(4);
-               PROGRAM_BATTERY_NUMBER2(5);
-               PROGRAM_BATTERY_NUMBER2(6);
-               PROGRAM_BATTERY_NUMBER2(7);
-               PROGRAM_BATTERY_NUMBER2(8);
-               PROGRAM_BATTERY_NUMBER2(9);
-               program {
-                       name : "number0_show";
-                       signal : "number0_show";
-                       source : "image.number.0";
-                       action : STATE_SET "default" 0.0;
-                       target : "image.number.0";
-               }
-               program {
-                       name : "number0_hide";
-                       signal : "number0_hide";
-                       source : "image.number.0";
-                       action : STATE_SET "hide" 0.0;
-                       target : "image.number.0";
-               }
-               program {
-                       name : "number.set.1";
-                       signal : "number.set.1";
-                       source : "bg";
-                       action : STATE_SET "1number" 0.0;
-                       target : "bg";
-               }
-               program {
-                       name : "number.set.2";
-                       signal : "number.set.2";
-                       source : "bg";
-                       action : STATE_SET "2number" 0.0;
-                       target : "bg";
-               }
-               program {
-                       name : "number.set.3";
-                       signal : "number.set.3";
-                       source : "bg";
-                       action : STATE_SET "3number" 0.0;
-                       target : "bg";
-               }
-
-
-       }
-}
-

diff --git a/src/windicator_moment_view.c b/src/windicator_moment_view.c
index 8addea3ad62f562f044c10b6a605d1fb4bb13975..6eb2af0ccd8434e572fe7d3e8f297278f47ab762 100644 (file)
--- a/src/windicator_moment_view.c
+++ b/src/windicator_moment_view.c
@@ -22,7 +22,7 @@
 #include "windicator_dynamic.h"
 #include "windicator_battery.h"
 
-Evas_Object *windicator_moment_view_battery_number_create(void *data)
+/*Evas_Object *windicator_moment_view_battery_number_create(void *data)
 {
         struct appdata *ad =(struct appdata *)data;
         retv_if(ad == NULL, NULL);
@@ -46,7 +46,7 @@ Evas_Object *windicator_moment_view_battery_number_create(void *data)
         evas_object_show(layout);
 
         return layout;
-}
+}*/
 
 Evas_Object *windicator_moment_view_battery_layout_create(void *data)
 {
@@ -74,7 +74,7 @@ Evas_Object *windicator_moment_view_battery_layout_create(void *data)
 
         evas_object_show(layout);
 
-        windicator_moment_view_battery_number_create(data);
+ //       windicator_moment_view_battery_number_create(data);
 
         _I("moment battery initialize END %x",ad->moment_view_battery_layout);
         return layout;