apply tab bounce effect bitmap

Change-Id: I7fdc384f687b803b5a4ade800beb7ef75d33fa8d

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left.png
new file mode 100644 (file)
index 0000000..bd86919
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_02.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_02.png
new file mode 100644 (file)
index 0000000..1f94bc7
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_02.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_h.png
index 3713091..9fe938b 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_h.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_h.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right.png
new file mode 100644 (file)
index 0000000..ed23f1f
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_02.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_02.png
new file mode 100644 (file)
index 0000000..c686ada
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_02.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_h.png
index 05301f6..f40a826 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_h.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_h.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_text_dim_left.#.png
similarity index 70%
rename from res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_right.png
rename to res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_text_dim_left.#.png
index b53c29d..d947162 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_right.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_text_dim_left.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_text_dim_right.#.png
similarity index 70%
rename from res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_right.png
rename to res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_text_dim_right.#.png
index b53c29d..a6ee545 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_right.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_text_dim_right.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_left.png
index 889e352..e1b9b72 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_left.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_left.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_right.png
index 3ab0ee3..9919627 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_right.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_right.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_text_dim_left.#.png
similarity index 69%
rename from res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_left.png
rename to res/common/usr/share/osp/bitmaps/480x800/00_effect_title_text_dim_left.#.png
index 94ac13c..3f95312 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_left.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_text_dim_left.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_text_dim_right.#.png
similarity index 69%
rename from res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_left.png
rename to res/common/usr/share/osp/bitmaps/480x800/00_effect_title_text_dim_right.#.png
index 94ac13c..20cb7ab 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_left.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_text_dim_right.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left.png
index a2e0161..f970f09 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left_h.png
index a5f423f..f65a982 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left_h.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left_h.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right.png
index 04086cd..d7d0bc4 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right_h.png
index 7de9f46..1c099ab 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right_h.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right_h.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_left.png
deleted file mode 100644 (file)
index 6fc3cde..0000000
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_left.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_right.png
deleted file mode 100644 (file)
index eb016e0..0000000
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_right.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left.png
index c1e3afb..3ed41f3 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_02.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_02.png
new file mode 100644 (file)
index 0000000..7f42e2a
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_02.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_h.png
index f8a0fea..5050480 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_h.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_h.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right.png
index 691ec73..a0e812f 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_02.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_02.png
new file mode 100644 (file)
index 0000000..2e3215e
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_02.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_h.png
index a34588e..eeac0e9 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_h.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_h.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_text_dim_left.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_text_dim_left.#.png
new file mode 100644 (file)
index 0000000..bab5be3
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_text_dim_left.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_text_dim_right.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_text_dim_right.#.png
new file mode 100644 (file)
index 0000000..33c27bb
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_text_dim_right.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_left.png
index a737958..e359b16 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_left.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_left.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_right.png
index e2161de..c45b135 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_right.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_right.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_text_dim_left.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_text_dim_left.#.png
new file mode 100644 (file)
index 0000000..67408d2
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_text_dim_left.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_text_dim_right.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_text_dim_right.#.png
new file mode 100644 (file)
index 0000000..e5c12c0
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_text_dim_right.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left.png
index 638a25d..39581c7 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left_h.png
index 07b32ea..5930089 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left_h.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left_h.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right.png
index 501d0cc..5879997 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right_h.png
index 6657de8..edcc904 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right_h.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right_h.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_right.png
deleted file mode 100644 (file)
index 691ec73..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_right.png and /dev/null differ

diff --git a/src/ui/inc/FUiCtrl_ToolbarPresenter.h b/src/ui/inc/FUiCtrl_ToolbarPresenter.h
index 3d20c2f..28e4392 100644 (file)
--- a/src/ui/inc/FUiCtrl_ToolbarPresenter.h
+++ b/src/ui/inc/FUiCtrl_ToolbarPresenter.h
@@ -148,8 +148,6 @@ protected:
        result _SetModel(const _ToolbarModel& toolbarModel);
 
 private:
-       void SetBouncingVisualElement(float startX, float startY);
-
        void StartFlickAnimation(void);
        result StartFlickAnimationTimer(void);
        result ResetFlickAnimationTimer(void);

diff --git a/src/ui/inc/FUi_ResourceHeaderConfig.h b/src/ui/inc/FUi_ResourceHeaderConfig.h
index a71506a..215946b 100644 (file)
--- a/src/ui/inc/FUi_ResourceHeaderConfig.h
+++ b/src/ui/inc/FUi_ResourceHeaderConfig.h
@@ -117,6 +117,8 @@ DECLARE_UI_CONFIG(HEADER);
        DECLARE_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, 90);
        DECLARE_COLOR_CONFIG(SELECTED_BAR_BG_NORMAL, 91);
        DECLARE_COLOR_CONFIG(SELECTED_BAR_TRANSLUCENT_BG_NORMAL, 92);
+       DECLARE_COLOR_CONFIG(BOUNCING_EFFECT, 93);
+
 
        // BITMAP
        DECLARE_IMAGE_CONFIG(BG_NORMAL, 1);
@@ -197,6 +199,15 @@ DECLARE_UI_CONFIG(HEADER);
        DECLARE_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, 72);
        DECLARE_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, 73);
 
+       DECLARE_IMAGE_CONFIG(TAB_LARGE_ITEM_BOUNCING_EFFECT_LEFT, 74);
+       DECLARE_IMAGE_CONFIG(TAB_LARGE_ITEM_BOUNCING_EFFECT_RIGHT, 75);
+
+       DECLARE_IMAGE_CONFIG(TITLE_TEXT_DIM_EFFECT_LEFT, 76);
+       DECLARE_IMAGE_CONFIG(TITLE_TEXT_DIM_EFFECT_RIGHT, 77);
+       DECLARE_IMAGE_CONFIG(TAB_TEXT_DIM_EFFECT_LEFT, 78);
+       DECLARE_IMAGE_CONFIG(TAB_TEXT_DIM_EFFECT_RIGHT, 79);
+
+
        DECLARE_ANIMATION_CONFIG(PROCESSING_ANIMATION, 1);
        DECLARE_SHAPE_CONFIG(HEIGHT, 1);
        DECLARE_SHAPE_CONFIG(WIDTH, 2);

diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
index a64d57b..a7b3ad1 100644 (file)
--- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
@@ -134,6 +134,8 @@ START_UI_CONFIG(HEADER);
        ADD_COLOR_CONFIG(SELECTED_BAR_BG_NORMAL, $B052L6P);
        ADD_COLOR_CONFIG(SELECTED_BAR_TRANSLUCENT_BG_NORMAL, $B052L6P);
 
+       ADD_COLOR_CONFIG(BOUNCING_EFFECT, $B018);
+
        // BITMAP
        ADD_IMAGE_CONFIG(BG_NORMAL, #00_title_bg.#.png);
        ADD_IMAGE_CONFIG(TRANSLUCENT_BG_NORMAL, #00_title_bg.#.png);
@@ -212,12 +214,20 @@ START_UI_CONFIG(HEADER);
        ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, #00_title_bg_ef.#.png); //not supported by theme
        ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, #00_title_press_ef.#.png); //not supported by theme
 
-       ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_VERTICAL,   #00_effect_tab_bounce_left.png);//117
-       ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_VERTICAL,  #00_effect_tab_bounce_right.png);//117
+       ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_VERTICAL,   #00_effect_tab_bounce_left.png);//96
+       ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_VERTICAL,  #00_effect_tab_bounce_right.png);//96
        ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_HORIZONTAL, #00_effect_tab_bounce_left_h.png);//91
        ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_HORIZONTAL,#00_effect_tab_bounce_right_h.png);//91
-       ADD_IMAGE_CONFIG(TITLE_TAB_ITEM_BOUNCING_EFFECT_LEFT,      #00_effect_title_tab_bounce_left.png);//64
-       ADD_IMAGE_CONFIG(TITLE_TAB_ITEM_BOUNCING_EFFECT_RIGHT,     #00_effect_title_tab_bounce_right.png);//64
+       ADD_IMAGE_CONFIG(TITLE_TAB_ITEM_BOUNCING_EFFECT_LEFT,      #00_effect_title_tab_bounce_left.png);//75
+       ADD_IMAGE_CONFIG(TITLE_TAB_ITEM_BOUNCING_EFFECT_RIGHT,     #00_effect_title_tab_bounce_right.png);//75
+       ADD_IMAGE_CONFIG(TAB_LARGE_ITEM_BOUNCING_EFFECT_LEFT,   #00_effect_tab_bounce_left_02.png);//126
+       ADD_IMAGE_CONFIG(TAB_LARGE_ITEM_BOUNCING_EFFECT_RIGHT,  #00_effect_tab_bounce_right_02.png);//126
+
+       ADD_IMAGE_CONFIG(TITLE_TEXT_DIM_EFFECT_LEFT,      #00_effect_title_text_dim_left.#.png);
+       ADD_IMAGE_CONFIG(TITLE_TEXT_DIM_EFFECT_RIGHT,     #00_effect_title_text_dim_right.#.png);
+       ADD_IMAGE_CONFIG(TAB_TEXT_DIM_EFFECT_LEFT,   #00_effect_tab_text_dim_left.#.png);
+       ADD_IMAGE_CONFIG(TAB_TEXT_DIM_EFFECT_RIGHT,  #00_effect_tab_text_dim_right.#.png);
+
 
        START_ANIMATION_CONFIG(PROCESSING_ANIMATION);
        ADD_ANIMATION_FRAME(#00_header_process_01.png, 16);