index: apply Tizen 6.0 IoT GUI to pagecontrolsubmit/tizen/20200508.001045submit/tizen/20200507.214726submit/tizen/20200507.060934submit/tizen/20200506.224620submit/tizen/20200506.062648submit/tizen/20200505.220303accepted/tizen/unified/20200510.220400

Change-Id: I2ea2d40f3b662a847012a38d1efc11fb56b3c6e2

8 files changed, 16 insertions, 62 deletions

diff --git a/common/HD-inc.edc b/common/HD-inc.edc
index 08440f8..b159999 100644
--- a/common/HD-inc.edc
+++ b/common/HD-inc.edc
@@ -663,8 +663,8 @@
 #define INDEX_SCROLL_TEXT1_DEFAULT_SIZE_INC         48 80
 
 // Page Control
-#define INDEX_PAGECONTROL_IND_INC 42 40
-#define INDEX_PAGECONTROL_IND_MIN_INC 40 40
+#define INDEX_PAGECONTROL_SIZE_INC 24 12 // 24 = 6 + 12 + 6
+#define INDEX_PAGECONTROL_ICON_SIZE_INC 12 12
 
 //****************************************************************************//
 // Popup
diff --git a/common/HD/images/Navigation_elements/core_page_indicator.svg b/common/HD/images/Navigation_elements/core_page_indicator.svg
new file mode 100755
index 0000000..5030c11
--- /dev/null
+++ b/common/HD/images/Navigation_elements/core_page_indicator.svg
@@ -0,0 +1,3 @@
+<svg id="_12-indicatorWHITE" data-name="12-indicatorWHITE" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">

+  <rect id="Rectangle_3653" data-name="Rectangle 3653" width="32" height="32" rx="16" fill="#fff"/>

+</svg>

diff --git a/common/HD/images/Navigation_elements/core_page_indicator_off.png b/common/HD/images/Navigation_elements/core_page_indicator_off.png
deleted file mode 100644
index 6d08b2e..0000000
--- a/common/HD/images/Navigation_elements/core_page_indicator_off.png
+++ /dev/null
diff --git a/common/HD/images/Navigation_elements/core_page_indicator_off_ef.png b/common/HD/images/Navigation_elements/core_page_indicator_off_ef.png
deleted file mode 100644
index db607a1..0000000
--- a/common/HD/images/Navigation_elements/core_page_indicator_off_ef.png
+++ /dev/null
diff --git a/common/HD/images/Navigation_elements/core_page_indicator_on.png b/common/HD/images/Navigation_elements/core_page_indicator_on.png
deleted file mode 100644
index ffc2d8e..0000000
--- a/common/HD/images/Navigation_elements/core_page_indicator_on.png
+++ /dev/null
diff --git a/common/HD/images/Navigation_elements/core_page_indicator_on_ef.png b/common/HD/images/Navigation_elements/core_page_indicator_on_ef.png
deleted file mode 100644
index 25ca951..0000000
--- a/common/HD/images/Navigation_elements/core_page_indicator_on_ef.png
+++ /dev/null
diff --git a/common/color_classes.edc b/common/color_classes.edc
index 50afe29..5be2fae 100644
--- a/common/color_classes.edc
+++ b/common/color_classes.edc
@@ -1306,10 +1306,10 @@ color_classes {
       color: 255 255 255 255;
    }
    color_class { "index_item/pagecontrol/icon";
-      color: 250 250 250 128;
+      color: 215 218 222 255;
    }
    color_class { "index_item/pagecontrol/icon_on";
-      color: 250 250 250 255;
+      color: 128 138 151 255;
    }
 
    /*
diff --git a/common/widgets/index.edc b/common/widgets/index.edc
index 3642ffa..1d2363c 100644
--- a/common/widgets/index.edc
+++ b/common/widgets/index.edc
@@ -859,73 +859,30 @@
       alias: "elm/index/item/horizontal/pagecontrol";
       alias: "elm/index/item_odd/horizontal/pagecontrol";
       images {
-         image: "core_page_indicator_on.png" COMP;
-         image: "core_page_indicator_on_ef.png" COMP;
-         image: "core_page_indicator_off.png" COMP;
-         image: "core_page_indicator_off_ef.png" COMP;
+         vector: "core_page_indicator.svg" COMP;
       }
       nomouse;
       parts {
          spacer { "base";
             scale;
             desc { "default";
-               min: INDEX_PAGECONTROL_IND_INC;
-               max: INDEX_PAGECONTROL_IND_INC;
+               min: INDEX_PAGECONTROL_SIZE_INC;
+               max: INDEX_PAGECONTROL_SIZE_INC;
             }
          }
-         image { "bg_indicator_off";
+         vector { "indicator";
             scale;
             desc { "default";
                fixed: 1 1;
                rel.to: "base";
-               min: INDEX_PAGECONTROL_IND_MIN_INC;
-               max: INDEX_PAGECONTROL_IND_MIN_INC;
-               image.normal: "core_page_indicator_off.png";
+               min: INDEX_PAGECONTROL_ICON_SIZE_INC;
+               max: INDEX_PAGECONTROL_ICON_SIZE_INC;
+               image.normal: "core_page_indicator.svg";
                color_class: "index_item/pagecontrol/icon";
             }
             desc { "active";
                inherit: "default";
-               hid;
-            }
-         }
-         image { "bg_indicator_off_shadow";
-            scale;
-            desc { "default";
-               fixed: 1 1;
-               image.normal: "core_page_indicator_off_ef.png";
-               rel.to: "bg_indicator_off";
-            }
-            desc { "active";
-               inherit: "default";
-               hid;
-            }
-         }
-         image { "bg_indicator_on";
-            scale;
-            desc { "default";
-               fixed: 1 1;
-               min: INDEX_PAGECONTROL_IND_MIN_INC;
-               max: INDEX_PAGECONTROL_IND_MIN_INC;
-               image.normal: "core_page_indicator_on.png";
                color_class: "index_item/pagecontrol/icon_on";
-               hid;
-            }
-            desc { "active";
-               inherit: "default";
-               vis;
-            }
-         }
-         image { "bg_indicator_on_shadow";
-            scale;
-            desc { "default";
-               fixed: 1 1;
-               image.normal: "core_page_indicator_on_ef.png";
-               rel.to: "bg_indicator_on";
-               hid;
-            }
-            desc { "active";
-               inherit: "default";
-               vis;
             }
          }
       }
@@ -933,17 +890,11 @@
       programs {
          program { "on_active";
             action: STATE_SET "active";
-            target: "bg_indicator_off";
-            target: "bg_indicator_off_shadow";
-            target: "bg_indicator_on";
-            target: "bg_indicator_on_shadow";
+            target: "indicator";
          }
          program { "on_inactive";
             action: STATE_SET "default";
-            target: "bg_indicator_off";
-            target: "bg_indicator_off_shadow";
-            target: "bg_indicator_on";
-            target: "bg_indicator_on_shadow";
+            target: "indicator";
          }
       }
    }