Replaced racist words | [TIZENIOT-1751] Updated SD icon image and size for album...

Change-Id: Ib5971142ee495a96c252cc1245e66f58ceafb981
Signed-off-by: mohitkr1 <mohit.kr1@samsung.com>

diff --git a/res/edje/gl-ctxpopup.edc b/res/edje/gl-ctxpopup.edc
index e640c7666241d00475edf9e93c1f25c06236c575..ebb5ecdf193f07143b07193b7faf4c80658090f5 100644 (file)
--- a/res/edje/gl-ctxpopup.edc
+++ b/res/edje/gl-ctxpopup.edc
@@ -623,7 +623,7 @@ group {
          }
       }
       part {
-         name: "sb_vbar_clip_master";
+         name: "sb_vbar_clip_main";
          type: RECT;
          mouse_events: 0;
          description {
@@ -636,7 +636,7 @@ group {
       }
       part {
          name: "sb_vbar_clip";
-         clip_to:"sb_vbar_clip_master";
+         clip_to:"sb_vbar_clip_main";
          type: RECT;
          mouse_events: 0;
          scale: 1;
@@ -746,7 +746,7 @@ group {
          }
       }
       part {
-         name: "sb_hbar_clip_master";
+         name: "sb_hbar_clip_main";
          type: RECT;
          mouse_events: 0;
          description {
@@ -759,7 +759,7 @@ group {
       }
       part {
          name: "sb_hbar_clip";
-         clip_to: "sb_hbar_clip_master";
+         clip_to: "sb_hbar_clip_main";
          type: RECT;
          mouse_events: 0;
          scale: 1;
@@ -915,14 +915,14 @@ group {
          signal: "elm,action,show,vbar";
          source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "sb_vbar_clip_master";
+         target: "sb_vbar_clip_main";
       }
       program {
          name: "vbar_hide";
          signal: "elm,action,hide,vbar";
          source: "elm";
          action:  STATE_SET "hidden" 0.0;
-         target: "sb_vbar_clip_master";
+         target: "sb_vbar_clip_main";
       }
       program {
          name: "vbar_show_always";
@@ -979,14 +979,14 @@ group {
          signal: "elm,action,show,hbar";
          source: "elm";
          action:  STATE_SET "default" 0.0;
-         target: "sb_hbar_clip_master";
+         target: "sb_hbar_clip_main";
       }
       program {
          name: "hbar_hide";
          signal: "elm,action,hide,hbar";
          source: "elm";
          action:  STATE_SET "hidden" 0.0;
-         target: "sb_hbar_clip_master";
+         target: "sb_hbar_clip_main";
       }
       program {
          name: "hbar_show_always";

diff --git a/res/edje/gl-gengrid-item-albums.edc b/res/edje/gl-gengrid-item-albums.edc
index 9a96c6d41084f7631cb47dbf593486f14f0e14b6..c46e564154f9d68b1eb4081ebfd32a6bece96944 100755 (executable)
--- a/res/edje/gl-gengrid-item-albums.edc
+++ b/res/edje/gl-gengrid-item-albums.edc
@@ -416,16 +416,16 @@ group {
                        description {
                                state: "default" 0.0;
                                visible: 0;
-                               rel1 { relative: 0.74 0.68; to: "elm.icon.clipper"; }
+                               rel1 { relative: 0.725 0.67; to: "elm.icon.clipper"; }
                                rel2 { relative: 0.90 0.84; to: "elm.icon.clipper"; }
-                               image.normal: GALLERY_EDC_SD_CARD_ICON;
+                               image.normal: GALLERY_EDC_SD_CARD_ICON_BG;
                        }
                        description {
                                state: "show" 0.0;
                                visible: 1;
-                               rel1 { relative: 0.74 0.68; to: "elm.icon.clipper"; }
+                               rel1 { relative: 0.725 0.67; to: "elm.icon.clipper"; }
                                rel2 { relative: 0.90 0.84; to: "elm.icon.clipper"; }
-                               image.normal: GALLERY_EDC_SD_CARD_ICON;
+                               image.normal: GALLERY_EDC_SD_CARD_ICON_BG;
                        }
                }
                GL_ALBUM_SD_ICON

diff --git a/res/edje/gl-gengrid-item-thumbview.edc b/res/edje/gl-gengrid-item-thumbview.edc
index d27242647d4067b57ee5644365b4cce7ff6c7cbc..5826400471bf0fc4081f3f69a9554cbb85498db4 100755 (executable)
--- a/res/edje/gl-gengrid-item-thumbview.edc
+++ b/res/edje/gl-gengrid-item-thumbview.edc
@@ -253,7 +253,7 @@ group {
                        }
                        description {
                                state: "show" 0.0;
-                               visible: 1;
+                               visible: 0;
                                rel1 {relative: 0 0; to: sd_card_icon_rect; }
                                rel2 {relative: 1 1; to: sd_card_icon_rect; }
                                image.normal: GALLERY_EDC_SD_CARD_ICON;

diff --git a/res/edje/gl-gengrid.edc b/res/edje/gl-gengrid.edc
index 05973a65f96f386928f4c370679d141074a3b693..db1c8981892ed2d2715ec8efa236bbd40665d638 100644 (file)
--- a/res/edje/gl-gengrid.edc
+++ b/res/edje/gl-gengrid.edc
@@ -197,7 +197,7 @@ group { name: "elm/scroller/base/gallery";
             rel2.offset: -1 -1;
          }
       }
-      part { name: "sb_vbar_clip_master";
+      part { name: "sb_vbar_clip_main";
          type: RECT;
          mouse_events: 0;
          scale: 1;
@@ -209,7 +209,7 @@ group { name: "elm/scroller/base/gallery";
          }
       }
       part { name: "sb_vbar_clip";
-         clip_to: "sb_vbar_clip_master";
+         clip_to: "sb_vbar_clip_main";
          type: RECT;
          mouse_events: 0;
          scale: 1;
@@ -274,7 +274,7 @@ group { name: "elm/scroller/base/gallery";
             }
          }
       }
-      part { name: "sb_hbar_clip_master";
+      part { name: "sb_hbar_clip_main";
          type: RECT;
          mouse_events: 0;
          scale: 1;
@@ -286,7 +286,7 @@ group { name: "elm/scroller/base/gallery";
          }
       }
       part { name: "sb_hbar_clip";
-         clip_to: "sb_hbar_clip_master";
+         clip_to: "sb_hbar_clip_main";
          type: RECT;
          mouse_events: 0;
          scale: 1;
@@ -386,13 +386,13 @@ group { name: "elm/scroller/base/gallery";
          signal: "elm,action,show,vbar";
          source: "elm";
          action:  STATE_SET "default" 0.0;
-         target: "sb_vbar_clip_master";
+         target: "sb_vbar_clip_main";
       }
       program { name: "vbar_hide";
          signal: "elm,action,hide,vbar";
          source: "elm";
          action:  STATE_SET "hidden" 0.0;
-         target: "sb_vbar_clip_master";
+         target: "sb_vbar_clip_main";
       }
       program { name: "vbar_show_always";
          signal: "elm,action,show_always,vbar";
@@ -443,13 +443,13 @@ group { name: "elm/scroller/base/gallery";
          signal: "elm,action,show,hbar";
          source: "elm";
          action:  STATE_SET "default" 0.0;
-         target: "sb_hbar_clip_master";
+         target: "sb_hbar_clip_main";
       }
       program { name: "hbar_hide";
          signal: "elm,action,hide,hbar";
          source: "elm";
          action:  STATE_SET "hidden" 0.0;
-         target: "sb_hbar_clip_master";
+         target: "sb_hbar_clip_main";
       }
       program { name: "hbar_show_always";
          signal: "elm,action,show_always,hbar";

diff --git a/res/edje/images/gallery_icon_sd_card.png b/res/edje/images/gallery_icon_sd_card.png
index 5848ce7434d813c6e1ef3a0a1d76e8b5935fabf8..08bf80ceba8afa7687baf4b81b0f3277731ea5fb 100644 (file)
Binary files a/res/edje/images/gallery_icon_sd_card.png and b/res/edje/images/gallery_icon_sd_card.png differ