From: Andrey Klimenko <and.klimenko@samsung.com>
Date: Tue, 1 Nov 2016 08:40:34 +0000 (+0200)
Subject: Merge branch 'tizen_dev' into tizen
X-Git-Tag: submit/tizen/20161101.085508^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=557997dc57558abb087c7f957c5fe5e961d41636;p=profile%2Fmobile%2Fapps%2Fnative%2Fmessage.git

Merge branch 'tizen_dev' into tizen

Change-Id: I2647c8d75d4f5d8f45b561bc3caa5e0407df7bf3
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>
---

557997dc57558abb087c7f957c5fe5e961d41636
diff --cc src/Conversation/AppControl/inc/AttachPanel.h
index 695ec30d,e229e60f..a95138cd
--- a/src/Conversation/AppControl/inc/AttachPanel.h
+++ b/src/Conversation/AppControl/inc/AttachPanel.h
@@@ -39,8 -39,8 +39,9 @@@ namespace Ms
  
              void setListener(IAttachPanelListener *l);
              void show(bool value);
 +            void reset();
              bool isVisible() const;
+             bool isFullExpanded() const;
  
          private:
              AttachPanel(const AttachPanel&) = delete;