Fixed Nabi Issues and removal of deprecated Footer API

Change-Id: Ife1b245df2b53d010fb85b339adb27532d65eab9
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>

diff --git a/src/IntAddBookmarkForm.cpp b/src/IntAddBookmarkForm.cpp
index 98847a1..c4de482 100644 (file)
--- a/src/IntAddBookmarkForm.cpp
+++ b/src/IntAddBookmarkForm.cpp
@@ -303,7 +303,7 @@ AddBookmarkForm::OnActionPerformed(const Control& source, int actionId)
 
                                if ( exist == true)
                                {
-                                       String msg = CommonUtil::GetString(L"IDS_BR_POP_ALREADY_EXISTS");
+                                       String msg = CommonUtil::GetString(L"IDS_BR_POP_BOOKMARK_ALREADY_EXISTS");
                                        CreateMessage(msg);
 
                                        AppLogDebug("Bookmark already exists");

diff --git a/src/IntBrightnessForm.cpp b/src/IntBrightnessForm.cpp
index 694c219..8ceeac0 100644 (file)
--- a/src/IntBrightnessForm.cpp
+++ b/src/IntBrightnessForm.cpp
@@ -172,7 +172,7 @@ BrightnessForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId&
        {
                __pBrightnessSlider->SetEnabled(true);
                AppLog("BatteryLvl %d",PowerManager::GetScreenBrightness());
-               __pBrightnessSlider->SetValue(PowerManager::GetScreenBrightness());
+               __pBrightnessSlider->SetValue(sliderValue);
                __pBrightnessSlider->Invalidate(true);
        }
 

diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp
index d94f7c7..6932a3d 100644 (file)
--- a/src/IntInternetApp.cpp
+++ b/src/IntInternetApp.cpp
@@ -186,6 +186,17 @@ InternetApp::OnAppInitialized(void)
                return false;
        }
 
+       AppRegistry* pAppRegistry = App::GetInstance()->GetAppRegistry();
+       String sliderKey("SliderValue");
+
+       int sliderValue = 0;
+
+
+       r = pAppRegistry->Get(sliderKey, sliderValue);
+       r = PowerManager::SetScreenBrightness(sliderValue);
+
+       AppLog("Settingscreenbrightness to %d result %s",sliderValue , GetErrorMessage(r));
+
        delete pArgList;
        pArgList = null;
        __pNewWindowInfo = null;

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index d8fc186..5cf43d7 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -2574,6 +2574,7 @@ void
 MainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
+
        AppLog("MainForm::OnSceneActivatedN called");
        String* pSelectedScene = NULL;
        Object* pValue = NULL;

diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp
index d788600..a41bafe 100644 (file)
--- a/src/IntSettingForm.cpp
+++ b/src/IntSettingForm.cpp
@@ -272,12 +272,12 @@ SettingForm::OnInitializing(void)
                __pList->AddGroupedListViewItemEventListener(*this);
        }
 
-       pFooter = GetFooter();
-       if (pFooter)
-       {
-               AppLogDebug("setting back button");
-               pFooter->SetBackButtonEnabled(true);
-       }
+//     pFooter = GetFooter();
+//     if (pFooter)
+//     {
+//             AppLogDebug("setting back button");
+//             pFooter->SetBackButtonEnabled(true);
+//     }
        SetFormBackEventListener(this);
        AppLog("SetFormBackEventListener result %s",GetErrorMessage(GetLastResult()));
        pSceneManager = SceneManager::GetInstance();