Nabi issue (N_SE-46194, N_SE-46212) fix

Change-Id: Ib7cc6afa65b42fa127b6a31d1a9e99923b874b8d

diff --git a/inc/CmBaseForm.h b/inc/CmBaseForm.h
index efd397d..8e5cd6d 100644 (file)
--- a/inc/CmBaseForm.h
+++ b/inc/CmBaseForm.h
@@ -44,6 +44,8 @@
 #include "CmCameraInfoPanel.h"
 #include "CmUtility.h"
 
+
+
 class BaseForm :
 public Tizen::Ui::Controls::Form
 , public Tizen::Ui::IAccessibilityListener
@@ -62,6 +64,7 @@ public Tizen::Ui::Controls::Form
 , public Tizen::Ui::IAdjustmentEventListener
 , public Tizen::Ui::ITouchEventListener
 , public Tizen::Ui::IPropagatedKeyEventListener
+, public ICameraUpdateEventListener
 {
 public:
        BaseForm(void);
@@ -137,6 +140,8 @@ public:
        virtual void OnAccessibilityFocusOut (const Tizen::Ui::Control &control, const Tizen::Ui::AccessibilityElement &element);
        virtual void OnAccessibilityScreenReaderStatusChanged (const Tizen::Ui::Control &control, const Tizen::Ui::AccessibilityElement &element, Tizen::Ui::AccessibilityScreenReaderStatus status);
 
+       virtual void OnUpdateView() = 0;
+
 protected:
        AppLaunchType GetAppLaunchType(void) const;
        BatteryState GetCurrentBatteryState(void);

diff --git a/inc/CmCamcorderForm.h b/inc/CmCamcorderForm.h
index 7eb69c8..5dfdb83 100644 (file)
--- a/inc/CmCamcorderForm.h
+++ b/inc/CmCamcorderForm.h
@@ -122,6 +122,8 @@ public:
        virtual void OnAccessibilityFocusOut (const Tizen::Ui::Control &control, const Tizen::Ui::AccessibilityElement &element);
        virtual void OnAccessibilityScreenReaderStatusChanged (const Tizen::Ui::Control &control, const Tizen::Ui::AccessibilityElement &element, Tizen::Ui::AccessibilityScreenReaderStatus status);
 
+       void OnUpdateView();
+
 private:
        enum ScreenMode
        {
@@ -403,6 +405,9 @@ private:
        Tizen::Graphics::Bitmap* __pRecordPauseBitmap;
        Tizen::Graphics::BufferInfo __bufferInfo;
        Tizen::Base::String __pFileEventPath;
+
+       Tizen::Graphics::Rectangle              CancelPopupRect;
+       Tizen::Graphics::Rectangle              ResetPopupRect;
 };
 
 #endif // _CM_CAMCORDER_FORM_H_

diff --git a/inc/CmCameraForm.h b/inc/CmCameraForm.h
index b448b79..686e831 100644 (file)
--- a/inc/CmCameraForm.h
+++ b/inc/CmCameraForm.h
@@ -46,6 +46,7 @@ enum GeneralTabSubMenuContent
 class CameraPresentationModel;
 class CameraStarterThread;
 
+
 class CameraForm
        : public ICameraEventListner
          ,public BaseForm
@@ -102,6 +103,8 @@ public:
        virtual void OnAccessibilityFocusOut (const Tizen::Ui::Control &control, const Tizen::Ui::AccessibilityElement &element);
        virtual void OnAccessibilityScreenReaderStatusChanged (const Tizen::Ui::Control &control, const Tizen::Ui::AccessibilityElement &element, Tizen::Ui::AccessibilityScreenReaderStatus status);
 
+       void OnUpdateView();
+
 private:
        enum ScreenMode
        {
@@ -335,4 +338,4 @@ private:
        Tizen::Base::String __pFileEventPath;
 };
 
-#endif // _CM_CAMERA_FORM_H_
\ No newline at end of file
+#endif // _CM_CAMERA_FORM_H_

diff --git a/inc/CmCameraThumbnailPanel.h b/inc/CmCameraThumbnailPanel.h
index 8e158d9..13c5181 100644 (file)
--- a/inc/CmCameraThumbnailPanel.h
+++ b/inc/CmCameraThumbnailPanel.h
@@ -23,7 +23,9 @@
 #include <FBase.h>
 #include <FGraphics.h>
 #include <FUi.h>
+
 #include "CmCameraResourceManager.h"
+#include "CmTypes.h"
 
 #ifndef _CM_CAMERA_THUMBNAIL_PANEL_H_
 #define _CM_CAMERA_THUMBNAIL_PANEL_H_
@@ -32,6 +34,7 @@ class CameraThumbnailPanel
        : public Tizen::Ui::Controls::Panel
        , public Tizen::Base::Runtime::ITimerEventListener
        , public Tizen::Ui::IOrientationEventListener
+       , public Tizen::Ui::IKeyEventListener
 {
 public:
        CameraThumbnailPanel(void);
@@ -50,6 +53,13 @@ public:
        virtual void OnTimerExpired(Tizen::Base::Runtime::Timer& timer);
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
 
+       //IKeyEventListener
+       virtual void OnKeyLongPressed (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode keyCode);
+       virtual void OnKeyPressed (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode keyCode);
+       virtual void OnKeyReleased (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode keyCode);
+
+       void SetUpdateListener(ICameraUpdateEventListener* pListener);
+
 private:
        Tizen::Graphics::Bitmap* __pOldBitmap;
        Tizen::Graphics::Bitmap* __pNewBitmap;
@@ -59,8 +69,10 @@ private:
        Tizen::Graphics::Canvas* __pCanvas;
        Tizen::Base::Runtime::Timer* __pAnimationTimer;
        Tizen::Ui::OrientationStatus __dir;
+
+       ICameraUpdateEventListener*             __pCameraUpdateListener;
        int __count;
        bool __ImgSilder;
 };
 
-#endif //_CM_CAMERA_THUMBNAIL_PANEL_H_
\ No newline at end of file
+#endif //_CM_CAMERA_THUMBNAIL_PANEL_H_

diff --git a/inc/CmTypes.h b/inc/CmTypes.h
index b683849..17a0007 100644 (file)
--- a/inc/CmTypes.h
+++ b/inc/CmTypes.h
@@ -22,6 +22,14 @@
 #ifndef _CM_TYPES_H_
 #define _CM_TYPES_H_
 
+
+
+class ICameraUpdateEventListener
+{
+public:
+       virtual void OnUpdateView() = 0;
+};
+
 enum ActionID
 {
        IDA_BUTTON_CAMCORDER_FLASH = 101,
@@ -303,4 +311,4 @@ extern const wchar_t* IDS_HELP_SHUTTER;
 extern const wchar_t* IDS_HELP_GOTO_GALLERY;
 extern const wchar_t* IDS_HELP_GOTO_PREVIOUS_SCREEN;
 
-#endif // _CM_TYPES_H_
\ No newline at end of file
+#endif // _CM_TYPES_H_

diff --git a/src/CmCamcorderForm.cpp b/src/CmCamcorderForm.cpp
index 1ff4844..6385a49 100644 (file)
--- a/src/CmCamcorderForm.cpp
+++ b/src/CmCamcorderForm.cpp
@@ -505,7 +505,18 @@ CamcorderForm::OnInitializing(void)
        CheckBatteryStatus();
        HideUiPanel(false);
 
+
+       _pResetPopUp = new (std::nothrow) Popup();
+       _pResetPopUp->Construct(L"IDL_RESET_POPUP");
+       ResetPopupRect = _pResetPopUp->GetBounds();
+
+       delete _pResetPopUp;
+       _pResetPopUp = null;
+
        r = InitializePopup();
+
+       CancelPopupRect = __pCancelPopup->GetBounds();
+
        AppLogDebug("InitializePopup()fail[%s]", GetErrorMessage(r));
 
        __pFileEventManager = new (std::nothrow) FileEventManager();
@@ -2267,7 +2278,8 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                                
                                HideRecLabe();
                                HideUiPanel(false);
-                               CancelRecord();                         
+                               CancelRecord();
+
                        }
                        
                        if (GetAppLaunchType() == APP_LAUNCH_TYPE_REQUESET && requestType == CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED)
@@ -2368,6 +2380,9 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
 
                                if (doHidePopup == true)
                                {
+                                       Update(false);
+
+                                       UpdatePopUp();
                                        HidePopup();
                                }
                        }
@@ -3977,9 +3992,12 @@ CamcorderForm::InitActionMenuPanel(void)
        _pThumbnailPanel->SetName(IDS_THUMBNAIL_PANLE_NAME);
        _pThumbnailPanel->AddTouchEventListener(*this);
        _pThumbnailPanel->SetShowState(false);
+       _pThumbnailPanel->AddKeyEventListener(*this);
        AddControl(_pThumbnailPanel);
        AddOrientationEventListener(*_pThumbnailPanel);
 
+       //_pThumbnailPanel->SetUpdateListener(this);
+
        _pAccessibilityElement = new AccessibilityElement();
        r = _pAccessibilityElement->Construct(rectAccessibility, L"Thumbnail Panel");
        _pAccessibilityElement->SetLabel(L"Tizen Panel");
@@ -5604,6 +5622,7 @@ CamcorderForm::ProcessGeneraTabMainListPopup(int index)
                                {
                                        _pResetPopUp = new (std::nothrow) Popup();
                                        _pResetPopUp->Construct(L"IDL_RESET_POPUP");
+
                                        _pResetPopUp->SetPropagatedKeyEventListener(this);
                                        TryCatch(_pResetPopUp != null, , "Reset Popup not created!");
                                }
@@ -7995,6 +8014,18 @@ CamcorderForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui:
                }
                Invalidate(true);
                __isOrientationChanged = false;
+
+               /*if ( _pResetPopUp !=null ||  _pResetPopUp->IsVisible())
+               {
+                       //_pResetPopUp->SetBounds(ResetPopupRect);
+                       //_pResetPopUp->Invalidate(true);
+
+               }
+               if ( __pCancelPopup !=null && __pCancelPopup->IsVisible())
+               {
+                       //__pCancelPopup->SetBounds(CancelPopupRect);
+                       //__pCancelPopup->Invalidate(true);
+               }*/
        }
        AppLogDebug("EXIT");
 }
@@ -12897,6 +12928,7 @@ CamcorderForm::InitializePopup(void)
        AppLogDebug("ENTER");
        Button* pOkButton = null;
        Button* pCancelButton = null;
+       Rectangle               popupRect;
 
        if (__pCancelPopup == null)
        {
@@ -12904,6 +12936,9 @@ CamcorderForm::InitializePopup(void)
                __pCancelPopup->Construct(L"IDL_CANCEL_POPUP");
                TryCatch(__pCancelPopup != null, , "Cancel Recording popup not created!");
 
+               popupRect = __pCancelPopup->GetBounds();
+               __pCancelPopup->SetBounds(popupRect);
+
                pOkButton = static_cast< Button*>(__pCancelPopup->GetControl(L"IDC_RECORDING_BUTTON_OK", true));
                TryCatch(pOkButton != null, , "Ok Button not added to the popup!");
                pOkButton->SetActionId(IDA_BUTTON_RECORDING_POPUP_OK);
@@ -13018,6 +13053,20 @@ void
 CamcorderForm::OnKeyReleased (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode keyCode)
 {
        //Empty Implementation
+       switch( keyCode )
+       {
+               case KEY_ENTER:
+                       if ((source.GetName().Equals(String(IDS_THUMBNAIL_PANLE_NAME))))
+                       {
+                               OnTouchLaunchImageview();
+                       }
+                       break;
+               default:
+               {
+
+               }
+               break;
+       }
 }
 
 void
@@ -13083,6 +13132,7 @@ CamcorderForm::OnKeyReleased (Control &source, const KeyEventInfo &keyEventInfo)
                }
                break;
 
+
        default:
                break;
        }
@@ -13242,3 +13292,8 @@ CamcorderForm::AddEnrichTextCustomItem(Tizen::Ui::Controls::CustomItem* pItem, i
                delete pCurrentTextElement;
        }
 }
+void
+CamcorderForm::OnUpdateView()
+{
+       OnTouchLaunchImageview();
+}

diff --git a/src/CmCameraForm.cpp b/src/CmCameraForm.cpp
index 8663c73..2675a40 100644 (file)
--- a/src/CmCameraForm.cpp
+++ b/src/CmCameraForm.cpp
@@ -1413,6 +1413,8 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
 
                                OnTimerCapturePause();
                                UpdatePopUp();
+
+                               HidePopup();
                        }
                }
                break;
@@ -2513,6 +2515,10 @@ CameraForm::InitActionMenuPanel(void)
 
        _pThumbnailPanel->SetName(IDS_THUMBNAIL_PANLE_NAME);
        _pThumbnailPanel->AddTouchEventListener(*this);
+       _pThumbnailPanel->AddKeyEventListener(*this);
+
+       //_pThumbnailPanel->SetUpdateListener(this);
+
        AddControl(_pThumbnailPanel);
        AddOrientationEventListener(*_pThumbnailPanel);
 
@@ -12104,7 +12110,7 @@ CameraForm::OnKeyPressed(const Tizen::Ui::Control &source, Tizen::Ui::KeyCode ke
 void
 CameraForm::OnKeyReleased (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode keyCode)
 {
-       AppLogDebug("Enter");
+       AppLogDebug("Enter  %d", keyCode);
        switch (keyCode)
        {
        case KEY_RIGHT:
@@ -12114,6 +12120,13 @@ CameraForm::OnKeyReleased (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode
                }
                break;
 
+       case KEY_ENTER:
+               if ((source.GetName().Equals(String(IDS_THUMBNAIL_PANLE_NAME))))
+               {
+                       OnTouchLaunchImageview();
+               }
+               break;
+
        default:
                break;
        }
@@ -12307,3 +12320,10 @@ CameraForm::AddEnrichTextCustomItem(Tizen::Ui::Controls::CustomItem* pItem, int
                delete pCurrentTextElement;
        }
 }
+
+
+void
+CameraForm::OnUpdateView()
+{
+       OnTouchLaunchImageview();
+}

diff --git a/src/CmCameraThumbnailPanel.cpp b/src/CmCameraThumbnailPanel.cpp
index de89e40..1519583 100644 (file)
--- a/src/CmCameraThumbnailPanel.cpp
+++ b/src/CmCameraThumbnailPanel.cpp
@@ -52,6 +52,7 @@ CameraThumbnailPanel::CameraThumbnailPanel(void)
        , __pCanvas(null)
        , __pAnimationTimer(null)
        , __dir(ORIENTATION_STATUS_NONE)
+       , __pCameraUpdateListener(null)
        , __count(null)
        , __ImgSilder(false)
 {
@@ -254,6 +255,8 @@ CameraThumbnailPanel::OnInitializing(void)
        __pBackgroundBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_THUMBNAIL_BG);
        __pCanvas = GetCanvasN();
 
+       AddKeyEventListener(*this);
+
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -433,3 +436,38 @@ CameraThumbnailPanel::SetDrawSliderImg(void)
        __pAnimationTimer->StartAsRepeatable(DRAWING_TIMER_INTERVAL);
        AppLogDebug("EXIT");
 }
+
+
+void
+CameraThumbnailPanel::OnKeyLongPressed (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode keyCode)
+{
+
+}
+void
+CameraThumbnailPanel::OnKeyPressed (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode keyCode)
+{
+
+}
+void
+CameraThumbnailPanel::OnKeyReleased (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode keyCode)
+{
+       AppLogDebug("Enter  %d", keyCode);
+       switch (keyCode)
+       {
+               case KEY_ENTER:
+               {
+                       if( __pCameraUpdateListener )
+                               __pCameraUpdateListener->OnUpdateView();
+               }
+                       break;
+
+               default:
+                       break;
+       }
+       AppLogDebug("Exit");
+}
+void
+CameraThumbnailPanel::SetUpdateListener(ICameraUpdateEventListener* pListener)
+{
+       __pCameraUpdateListener = pListener;
+}