Nabi issues resolution N_SE-37517, N_SE-37891, N_SE-37835

Change-Id: I914994bdd7a41abf20b9393cf59192a000972612
Signed-off-by: chitta ranjan <chitta.rs@samsung.com>

diff --git a/inc/StWallpaperAlbumListDetailForm.h b/inc/StWallpaperAlbumListDetailForm.h
index 5bf62f0..7c020c3 100644 (file)
--- a/inc/StWallpaperAlbumListDetailForm.h
+++ b/inc/StWallpaperAlbumListDetailForm.h
@@ -33,6 +33,7 @@ class WallpaperAlbumListDetailForm
        , public Tizen::Ui::IOrientationEventListener
        , public Tizen::Ui::Scenes::ISceneEventListener
        , public Tizen::App::IAppControlResponseListener
+       , public Tizen::Ui::IFocusEventListener
 {
 public:
        WallpaperAlbumListDetailForm(void);
@@ -58,6 +59,9 @@ public:
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
        virtual void OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId, const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pExtraData);
 
+       virtual void OnFocusGained(const Tizen::Ui::Control& source);
+       virtual void OnFocusLost(const Tizen::Ui::Control& source);
+
 private:
        void CreateIconListView(void);
        void SetOrientationAutoMode(void);
@@ -66,6 +70,7 @@ private:
        void SetAllAlbumPathList(void);
 
 private:
+       bool __isRunningAppControl;
        int __itemCount;
        Tizen::Base::UuId* __pContentId;
        WallpaperAlbumListPresentationModel* __pPresentationModel;

diff --git a/res/est-EE.xml b/res/est-EE.xml
index ee57e47..aca6a56 100644 (file)
--- a/res/est-EE.xml
+++ b/res/est-EE.xml
@@ -17,7 +17,7 @@
     <text id="IDS_WIFI_SK_DISCONNECT">Katkesta ühendus</text>
     <text id="IDS_ST_BUTTON_OPEN">Ava</text>
     <text id="IDS_ST_BODY_VERSION">Versioon</text>
-    <text id="IDS_IME_BODY_LANG_ENGLISH_HUNITED_KINGDOM">Inglise (UK)</text>
+    <text id="IDS_IME_BODY_LANG_ENGLISH_HUNITED_KINGDOM">English (UK)</text>
     <text id="IDS_ST_BODY_SECURITY">Turvalisus</text>
     <text id="IDS_ST_BODY_CLOCK">Kell</text>
     <text id="IDS_ST_BODY_NAME">Nimi</text>
@@ -92,7 +92,7 @@
     <text id="IDS_IME_OPT_LANG_CZECH">Čeština</text>
     <text id="IDS_ST_BODY_APPLICATION">Rakendus</text>
     <text id="IDS_ST_MBODY_HOME_SCREEN_WALLPAPER">Avaekraani taustpilt</text>
-    <text id="IDS_IME_BODY_LANG_ENGLISH_HUNITED_STATES">Inglise (US)</text>
+    <text id="IDS_IME_BODY_LANG_ENGLISH_HUNITED_STATES">English (US)</text>
     <text id="IDS_ST_BODY_EMAIL_ALERT">E-kirja märguanne</text>
     <text id="IDS_ST_BODY_SHOW_HELP_TEXT_ON_LOCK_SCREEN">Näita spikrit lukustusekraanil</text>
     <text id="IDS_ST_BODY_SELECT_NETWORK">Vali võrk</text>

diff --git a/src/StAppSettingForm.cpp b/src/StAppSettingForm.cpp
index 6967b50..2d6ed36 100644 (file)
--- a/src/StAppSettingForm.cpp
+++ b/src/StAppSettingForm.cpp
@@ -949,7 +949,7 @@ AppSettingForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScen
                        }
                        String* pValue = pCurrent->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_VALUE);
                        if ((pValue->Equals(L"true", false))
-                               || (pValue->Equals(L"0", false)))
+                               || (pValue->Equals(L"1", false)))
                        {
                                __pTableView->SetItemChecked(itemTag->GetGroupIndex(), itemTag->GetItemIndex(), true);
                        }
@@ -1311,7 +1311,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                toggleValue = Boolean::Parse((*valueString).GetPointer(), true);
 
-               if ((toggleValue != 0) || ((*valueString).Equals(DEFAULT_VALUE_STRING, true)))
+               if ((toggleValue != false) || (*valueString == DEFAULT_VALUE_STRING))
                {
                        __pTableView->SetItemChecked(groupIndex, itemIndex, true);
                }

diff --git a/src/StSettingsApp.cpp b/src/StSettingsApp.cpp
index 2e85284..5fca9b8 100644 (file)
--- a/src/StSettingsApp.cpp
+++ b/src/StSettingsApp.cpp
@@ -115,7 +115,6 @@ void
 SettingsApp::OnForeground(void)
 {
        AppLogDebug("Foreground");
-
        Form* pCurrentForm = (SceneManager::GetInstance()->GetCurrentScene()->GetForm());
        pCurrentForm->SendUserEvent(FRFRESH_REQUEST_EVENT, null);
 }

diff --git a/src/StWallpaperAlbumListDetailForm.cpp b/src/StWallpaperAlbumListDetailForm.cpp
index b63e313..1ebd8ec 100644 (file)
--- a/src/StWallpaperAlbumListDetailForm.cpp
+++ b/src/StWallpaperAlbumListDetailForm.cpp
@@ -50,7 +50,8 @@ static const String IMAGE_VIEWER_APP_ID = L"tizen.imageviewer";
 static const String IMAGE_VIEWER_CROP_OPERATION_ID = L"http://tizen.org/appcontrol/operation/image/crop";
 
 WallpaperAlbumListDetailForm::WallpaperAlbumListDetailForm(void)
-       : __itemCount(0)
+       : __isRunningAppControl(false)
+       , __itemCount(0)
        , __pContentId(null)
        , __pPresentationModel(null)
        , __pIconListView(null)
@@ -213,6 +214,8 @@ WallpaperAlbumListDetailForm::OnInitializing(void)
 {
        __pPresentationModel = WallpaperAlbumListPresentationModel::GetInstance();
 
+       AddFocusEventListener(*this);
+
        return E_SUCCESS;
 }
 
@@ -279,6 +282,13 @@ void
 WallpaperAlbumListDetailForm::OnIconListViewItemStateChanged(IconListView& view, int index, IconListViewItemStatus status)
 {
        AppLogDebug("ENTER");
+
+       if (__isRunningAppControl)
+       {
+               AppLogDebug("busy status");
+               return;
+       }
+
        if (status == ICON_LIST_VIEW_ITEM_SELECTED)
        {
                IList* pContentIdList = __pPresentationModel->GetContentIdList();
@@ -306,7 +316,10 @@ WallpaperAlbumListDetailForm::OnIconListViewItemStateChanged(IconListView& view,
                {
                        pAc->Start(&uri, null, &extraData, this);
                        delete pAc;
+
+                       __isRunningAppControl = true;
                }
+
        }
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
@@ -314,6 +327,11 @@ WallpaperAlbumListDetailForm::OnIconListViewItemStateChanged(IconListView& view,
 void
 WallpaperAlbumListDetailForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 {
+       if (__isRunningAppControl)
+       {
+               AppLogDebug("busy status");
+               return;
+       }
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
@@ -563,6 +581,8 @@ WallpaperAlbumListDetailForm::OnAppControlCompleteResponseReceived(const AppId&
                        AppLog("Image crop was aborted.");
                }
 
+               __isRunningAppControl = false;
+
                __pPresentationModel->InitializeAlbumInfoList();
                SetAllAlbumPathList();
                __pPresentationModel->InitializeFileList(__pAlbumPathList);
@@ -608,3 +628,14 @@ WallpaperAlbumListDetailForm::SetAllAlbumPathList(void)
        }
        __pAlbumPathList = pAlbumPathList;
 }
+
+void
+WallpaperAlbumListDetailForm::OnFocusGained(const Tizen::Ui::Control& source)
+{
+       __isRunningAppControl = false;
+}
+
+void
+WallpaperAlbumListDetailForm::OnFocusLost(const Tizen::Ui::Control& source)
+{
+}