NABI issues N_SE-43313, N_SE-43295, N_SE-43185, N_SE-43379 and N_SE-43346

Change-Id: I53a2bfb99cb5dd5e99da3fb71fe4aaf9aa831110

diff --git a/inc/ClkAlarmEditorForm.h b/inc/ClkAlarmEditorForm.h
index ac36b35..7b4422d 100644 (file)
--- a/inc/ClkAlarmEditorForm.h
+++ b/inc/ClkAlarmEditorForm.h
@@ -1,4 +1,4 @@
-//
+// 
 // Tizen Native SDK
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //

diff --git a/packaging/apps.Clock.spec b/packaging/apps.Clock.spec
index 777c560..12546db 100755 (executable)
--- a/packaging/apps.Clock.spec
+++ b/packaging/apps.Clock.spec
@@ -19,6 +19,7 @@ BuildRequires:  osp-media-internal-devel
 BuildRequires:  pkgconfig(osp-image-core)
 BuildRequires:  pkgconfig(osp-telephony)
 BuildRequires:  pkgconfig(osp-shell)
+BuildRequires:  hash-signer
 
 %description
 Verification application: Clock

diff --git a/res/screen-density-xhigh/00_button_radio_press2.png b/res/screen-density-xhigh/00_button_radio_press2.png
index 7d3eda3..aa2a5c1 100644 (file)
Binary files a/res/screen-density-xhigh/00_button_radio_press2.png and b/res/screen-density-xhigh/00_button_radio_press2.png differ

diff --git a/src/ClkAlarmEditorForm.cpp b/src/ClkAlarmEditorForm.cpp
index 307de82..a0edc82 100644 (file)
--- a/src/ClkAlarmEditorForm.cpp
+++ b/src/ClkAlarmEditorForm.cpp
@@ -2009,7 +2009,7 @@ AlarmEditorForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
                __pListView->SetItemChecked(0,__pAlarm->GetSnoozeOn());
        }
 
-/*     if (__pEditField != null)
+       /*      if (__pEditField != null)
        {
                int byteCount = 0;
                Utf8Encoding utf8;
@@ -2082,18 +2082,18 @@ AlarmEditorForm::OnListViewItemStateChanged(ListView& listView, int index, int e
 
        if (index == 0)
        {
-                       if (status == LIST_ITEM_STATUS_UNCHECKED)
-                       {
-                               __pAlarm->SetSnoozeOn(false);
-                               __pListView->RefreshList(1,LIST_REFRESH_TYPE_ITEM_REMOVE);
-                       }
-                       else if(status == LIST_ITEM_STATUS_CHECKED)
-                       {
-                               __pAlarm->SetSnoozeOn(true);
-                               __pListView->RefreshList(1,LIST_REFRESH_TYPE_ITEM_ADD);
-                       }
+               if (status == LIST_ITEM_STATUS_UNCHECKED)
+               {
+                       __pAlarm->SetSnoozeOn(false);
+                       __pListView->RefreshList(1,LIST_REFRESH_TYPE_ITEM_REMOVE);
+               }
+               else if(status == LIST_ITEM_STATUS_CHECKED)
+               {
+                       __pAlarm->SetSnoozeOn(true);
+                       __pListView->RefreshList(1,LIST_REFRESH_TYPE_ITEM_ADD);
+               }
 
-                       RearrangeControls();
+               RearrangeControls();
        }
 
        else if (index == 1)
@@ -2606,10 +2606,15 @@ AlarmEditorForm::RearrangeControls(void)
        int list2HeightOn = 256 + 5;
 
        int heightOffset = 0;
+       int editFieldOffset = 0;
        ClockApp* pClock = static_cast<ClockApp*>(ClockApp::GetInstance());
        heightOffset = pClock->GetHeightOffset();
        AppLog("the offset: %d",heightOffset);
 
+       if (pClock->GetFontSize() != 44)
+       {
+               editFieldOffset += 5;
+       }
        if (__pGroupedListView == NULL || __pListView == NULL || __pEditField == NULL)
        {
                return;
@@ -2643,7 +2648,7 @@ AlarmEditorForm::RearrangeControls(void)
                }
 
                __pLabelEditfieldTitle->SetBounds(Rectangle(__pLabelEditfieldTitle->GetX(),__pListView->GetY()+__pListView->GetHeight()+15, __pLabelEditfieldTitle->GetWidth(), __pLabelEditfieldTitle->GetHeight()));
-               __pEditField->SetBounds(Rectangle(__pEditField->GetX(), __pLabelEditfieldTitle->GetY()+__pLabelEditfieldTitle->GetHeight(), __pEditField->GetWidth(), __pEditField->GetHeight()));
+               __pEditField->SetBounds(Rectangle(__pEditField->GetX(), __pLabelEditfieldTitle->GetY()+__pLabelEditfieldTitle->GetHeight(), __pEditField->GetWidth(), __pEditField->GetHeight()+editFieldOffset));
                if(__typeName == 1)
                {
                        panelHeight = __pEditField->GetHeight()+ __pListView->GetHeight() + __pGroupedListView->GetHeight() + __pLabelEditfieldTitle->GetHeight()+35;
@@ -2669,7 +2674,7 @@ AlarmEditorForm::RearrangeControls(void)
                        __pListView->SetBounds(Rectangle(__pListView->GetBounds().x,__pGroupedListView->GetY()+__pGroupedListView->GetHeight(), __pListView->GetWidth(), list2HeightOn));
                }
                __pLabelEditfieldTitle->SetBounds(Rectangle(__pLabelEditfieldTitle->GetX(),__pListView->GetY()+__pListView->GetHeight()+15, __pLabelEditfieldTitle->GetWidth(),__pLabelEditfieldTitle->GetHeight()));
-               __pEditField->SetBounds(Rectangle(__pEditField->GetX(), __pLabelEditfieldTitle->GetY()+__pLabelEditfieldTitle->GetHeight(), __pEditField->GetWidth(), __pEditField->GetHeight()));
+               __pEditField->SetBounds(Rectangle(__pEditField->GetX(), __pLabelEditfieldTitle->GetY()+__pLabelEditfieldTitle->GetHeight(), __pEditField->GetWidth(), __pEditField->GetHeight()+editFieldOffset));
                if(__typeName == 1)
                {
                        panelHeight = __pEditField->GetHeight()+ __pListView->GetHeight() + __pGroupedListView->GetHeight() + __pLabelEditfieldTitle->GetHeight()+35;
@@ -2685,7 +2690,7 @@ AlarmEditorForm::RearrangeControls(void)
        {
                __pListView->SetBounds(Rectangle(__pListView->GetBounds().x,__pListView->GetBounds().y, __pListView->GetWidth(), 112));
                __pLabelEditfieldTitle->SetBounds(Rectangle(__pLabelEditfieldTitle->GetX(),__pListView->GetY() + __pListView->GetHeight(), __pLabelEditfieldTitle->GetWidth(), __pLabelEditfieldTitle->GetHeight()));
-               __pEditField->SetBounds(Rectangle(__pEditField->GetX(), __pLabelEditfieldTitle->GetY()+__pLabelEditfieldTitle->GetHeight(), __pEditField->GetWidth(), __pEditField->GetHeight()));
+               __pEditField->SetBounds(Rectangle(__pEditField->GetX(), __pLabelEditfieldTitle->GetY()+__pLabelEditfieldTitle->GetHeight(), __pEditField->GetWidth(), __pEditField->GetHeight()+editFieldOffset));
                if(__typeName == 1)
                {
                        panelHeight = __pEditField->GetHeight()+ __pListView->GetHeight() + __pGroupedListView->GetHeight() + __pLabelEditfieldTitle->GetHeight()+35;
@@ -2700,7 +2705,7 @@ AlarmEditorForm::RearrangeControls(void)
        {
                __pListView->SetBounds(Rectangle(__pListView->GetBounds().x,__pListView->GetBounds().y, __pListView->GetWidth(), 240 + heightOffset));
                __pLabelEditfieldTitle->SetBounds(Rectangle(__pLabelEditfieldTitle->GetX(), __pListView->GetY() + __pListView->GetHeight(), __pLabelEditfieldTitle->GetWidth(), __pLabelEditfieldTitle->GetHeight()));
-               __pEditField->SetBounds(Rectangle(__pEditField->GetX(), __pLabelEditfieldTitle->GetY()+__pLabelEditfieldTitle->GetHeight(), __pEditField->GetWidth(), __pEditField->GetHeight()));
+               __pEditField->SetBounds(Rectangle(__pEditField->GetX(), __pLabelEditfieldTitle->GetY()+__pLabelEditfieldTitle->GetHeight(), __pEditField->GetWidth(), __pEditField->GetHeight()+editFieldOffset));
                if(__typeName == 1)
                {
                        panelHeight = __pEditField->GetHeight()+ __pListView->GetHeight() + __pGroupedListView->GetHeight() + __pLabelEditfieldTitle->GetHeight()+35;
@@ -2796,7 +2801,7 @@ AlarmEditorForm::OnKeypadOpened(Control& source)
                        pHeader->SetTitleText(__pEditField->GetText());
                }
 
-/*             save.Construct(BUTTON_ITEM_STYLE_TEXT,IDA_HEADER_ITEM_SAVE);
+               /*              save.Construct(BUTTON_ITEM_STYLE_TEXT,IDA_HEADER_ITEM_SAVE);
                cancel.Construct(BUTTON_ITEM_STYLE_TEXT,IDA_HEADER_ITEM_CANCEL);
 
                save.SetText(CommonUtil::GetString(L"IDS_ALM_SK3_SAVE"));
@@ -3238,10 +3243,6 @@ AlarmEditorForm::OnSettingChanged(Tizen::Base::String& key)
                }
 
        }
-
-
-       //__pListView->UpdateList();
-
 }
 
 void
@@ -3316,16 +3317,11 @@ bool
 AlarmEditorForm::ValidatePastedText(const Tizen::Base::String &pastedText, Tizen::Base::String &replacedText)
 {
        AppLog("AlarmEditorForm::ValidatePastedText");
-       String text = __pEditField->GetText();
-       String currentInput;
        MessageBox msgBox;
-       text.Append(pastedText);
-       __pEditField->SetText(text);
-       if ( text.GetLength() >= 100)
+       int textLength = __pEditField->GetText().GetLength() - replacedText.GetLength() + pastedText.GetLength();
+       if (textLength >= 100)
        {
                __showMessageBox = false;
-               text.SubString(0, 100, currentInput);
-               __pEditField->SetText(currentInput);
                __pEditField->RemoveTextEventListener(*this);
                String msg = CommonUtil::GetString("IDS_MAX_CHARACTER_LIMIT_MESSAGE");
                msgBox.Construct(L"", msg, MSGBOX_STYLE_NONE, 3000);
@@ -3333,5 +3329,5 @@ AlarmEditorForm::ValidatePastedText(const Tizen::Base::String &pastedText, Tizen
                __pEditField->AddTextEventListener(*this);
                __pEditField->ShowKeypad();
        }
-       return true;
+       return false;
 }

diff --git a/src/ClkClockApp.cpp b/src/ClkClockApp.cpp
index 223701e..19bae09 100644 (file)
--- a/src/ClkClockApp.cpp
+++ b/src/ClkClockApp.cpp
@@ -458,7 +458,7 @@ void
 ClockApp::OnSettingChanged(Tizen::Base::String& key)
 {
        AppLog("ClockApp::OnSettingChanged: %ls", key.GetPointer());
-       if (key == L"http://tizen.org/setting/locale.language")
+       if (key == L"http://tizen.org/setting/locale.language" || key == L"http://tizen.org/setting/font.size")
        {
                Terminate();
        }