Resize issue fixed,removed add button

Change-Id: I4138bef0c36989df526739348f983c85e10f0920

diff --git a/Settings/MainAccount/MainAccount.cs b/Settings/MainAccount/MainAccount.cs
index 6005726efbcaf9df89c991a3a3bb15f7c2725289..4aba69a4f4c484cc72f07a447173ea94063f74c5 100644 (file)
--- a/Settings/MainAccount/MainAccount.cs
+++ b/Settings/MainAccount/MainAccount.cs
@@ -43,4 +43,4 @@ namespace MainAccount
             app.Run(args);
         }
     }
-}
+}
\ No newline at end of file

diff --git a/Settings/MainAccount/SettingWidgetAccount.cs b/Settings/MainAccount/SettingWidgetAccount.cs
index e3d278b27526e110ac21276626cd61cfa0e14e3d..0ae013fff93234b27fdbd9c2751823fac754f5bb 100644 (file)
--- a/Settings/MainAccount/SettingWidgetAccount.cs
+++ b/Settings/MainAccount/SettingWidgetAccount.cs
@@ -32,8 +32,8 @@ namespace MainAccount
 
         private void OnWindowResized(object sender, Window.ResizedEventArgs e)
         {
-            Tizen.Log.Info("Testing", "Resizing");
-            viewManager.UpdateView();  
+            Tizen.Log.Info("TESTAPP", "Resizing");
+            viewManager.UpdateView();
         }
 
         protected override void OnPause()
@@ -48,7 +48,7 @@ namespace MainAccount
 
         protected override void OnResize(Window window)
         {
-            base.OnResize(window); 
+            base.OnResize(window);
         }
 
         protected override void OnUpdate(string contentInfo, int force)
@@ -61,5 +61,4 @@ namespace MainAccount
             base.OnTerminate(contentInfo, type);
         }
     }
-}
-
+}
\ No newline at end of file

diff --git a/Settings/MainAccount/ViewManager.cs b/Settings/MainAccount/ViewManager.cs
index 80d46c8bdf3196ae906db2226060d896e361290a..b791c73718abd32c5abc6bbeb983a8557f06559b 100644 (file)
--- a/Settings/MainAccount/ViewManager.cs
+++ b/Settings/MainAccount/ViewManager.cs
@@ -48,7 +48,7 @@ namespace MainAccount
             Button navigationContent = new Button(appBarStyle.BackButton);
             navigationContent.Clicked += (object source, ClickedEventArgs e) =>
             {
-               CloseAccount();  
+               CloseAccount();
             };
             appBar.NavigationContent = navigationContent;
             RelativeLayout.SetLeftTarget(appBar.NavigationContent, appBar);
@@ -56,9 +56,9 @@ namespace MainAccount
             RelativeLayout.SetVerticalAlignment(appBar.NavigationContent, RelativeLayout.Alignment.Center);
             appBarStyle.Dispose();
 
-            Button actionContent = new Button()
+           /* Button actionContent = new Button()
             {
-                BackgroundColor = Color.Transparent, 
+                BackgroundColor = Color.Transparent,
                 TextColor = Color.Red,
                 Size2D = new Size2D(100, 48).SpToPx(),
                 Text = "Add",
@@ -74,10 +74,10 @@ namespace MainAccount
             RelativeLayout.SetLeftTarget(appBar.ActionContent, appBar.TitleContent);
             RelativeLayout.SetLeftRelativeOffset(appBar.ActionContent, 1.0f);
             RelativeLayout.SetVerticalAlignment(appBar.ActionContent, RelativeLayout.Alignment.Center);
-
+           */
             TextLabel titleContent = new TextLabel("Accounts")
             {
-                WidthSpecification = Window.Instance.Size.Width - 175.SpToPx(), 
+                WidthSpecification = Window.Instance.Size.Width - 175.SpToPx(),
                 PixelSize = 40.SpToPx(),
                 FontFamily = "BreezeSans",
 
@@ -110,7 +110,7 @@ namespace MainAccount
                     WidthSpecification = LayoutParamPolicies.MatchParent,
                     HeightSpecification = LayoutParamPolicies.MatchParent,
                 },*/
-                BackgroundColor = Color.White, 
+                BackgroundColor = Color.White,
                 Content = new TextLabel()
                 {
                     HorizontalAlignment = HorizontalAlignment.Center,

diff --git a/Settings/MainAccount/tizen-manifest.xml b/Settings/MainAccount/tizen-manifest.xml
index d2e4b6f6fae5e600e793e9e4fc89d7777990cc0b..612754842fbd1ed444b57bb18a5c6c456706f0ad 100644 (file)
--- a/Settings/MainAccount/tizen-manifest.xml
+++ b/Settings/MainAccount/tizen-manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="7" package="org.tizen.cssetting-account" version="1.0.0">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="7" package="org.tizen.cssetting-account" version="1.0.1">
        <profile name="common" />
        <widget-application appid="org.tizen.cssetting-account" exec="MainAccount.dll" type="dotnet" multiple="false" taskmanage="true" nodisplay="false" launch_mode="single">
                <icon>MainAccount.png</icon>
@@ -16,5 +16,4 @@
                <privilege>http://tizen.org/privilege/account.read</privilege>
                <privilege>http://tizen.org/privilege/account.write</privilege>
        </privileges>
-</manifest>
-
+</manifest>
\ No newline at end of file

diff --git a/Settings/SettingView/SettingBorderView.cs b/Settings/SettingView/SettingBorderView.cs
index 38919c4d14ff6af3387ede318e4093c4ce149405..3e1e5698fab729aec7c2b3419bd7ff078d1fc4c7 100644 (file)
--- a/Settings/SettingView/SettingBorderView.cs
+++ b/Settings/SettingView/SettingBorderView.cs
@@ -216,7 +216,7 @@ namespace SettingView
         {
             if (borderView != null)
             {
-                borderView.BackgroundColor = new Color(0, 1, 0, 0.3f); // Background of border.
+                borderView.BackgroundColor = new Color(0, 0, 1, 0.3f); //Background of border.
             }
         }
 
@@ -234,7 +234,7 @@ namespace SettingView
                     //title.Show();
                     hide = false;
                 }
-                borderView.BackgroundColor = new Color(1, 1, 1, 0.3f); //  After resize color return to original
+                borderView.BackgroundColor = new Color(1, 1, 1, 0.3f); //After resize color return to original
                 base.OnResized(width, height);
                 UpdateIcons();
             }
@@ -261,4 +261,4 @@ namespace SettingView
             }
         }
     }
-}
+}
\ No newline at end of file

diff --git a/Settings/SettingView/SettingView.cs b/Settings/SettingView/SettingView.cs
index af20bc29b4d861142eb1b9ea6e66d3248d1cef78..cd5eb18854e90c78f9f6563b4b7c8f43b9d0db65 100644 (file)
--- a/Settings/SettingView/SettingView.cs
+++ b/Settings/SettingView/SettingView.cs
@@ -9,7 +9,6 @@ namespace SettingView
     public class Program : NUIApplication
     {
         private WidgetView widgetView;
-        
         public Program(string styleSheet, Size2D windowSize, Position2D windowPosition, IBorderInterface borderInterface)
             : base(styleSheet, windowSize, windowPosition, borderInterface)
         {
@@ -26,12 +25,12 @@ namespace SettingView
             bundle.AddItem("COUNT", "1");
             string encodedBundle = bundle.Encode();
 
-            widgetView = WidgetViewManager.Instance.AddWidget("account@org.tizen.cssetting-account", encodedBundle, window.Size.Width, window.Size.Height, 0.0f); //(540,960)
+            widgetView = WidgetViewManager.Instance.AddWidget("account@org.tizen.cssetting-account", encodedBundle, window.Size.Width, window.Size.Height, 0.0f);//(540,960)
             widgetView.WidthSpecification = LayoutParamPolicies.MatchParent;
             widgetView.HeightSpecification = LayoutParamPolicies.MatchParent;
-            widgetView.Position = new Position(0, 0); // Position of the application window(Account)
+            widgetView.Position = new Position(0, 0); //Position of the application window(Account)
             widgetView.WidgetContentUpdated += OnWidgetContentUpdated;
-            window.GetDefaultLayer().Add(widgetView);
+            window.GetDefaultNavigator().Push(new ContentPage() { Content = widgetView });
         }
 
         private void OnWidgetContentUpdated(object sender, WidgetView.WidgetViewEventArgs e)
@@ -69,4 +68,4 @@ namespace SettingView
             app.Run(args);
         }
     }
-}
+}
\ No newline at end of file

diff --git a/Settings/SettingView/tizen-manifest.xml b/Settings/SettingView/tizen-manifest.xml
index 91ed248828b07f5f381b77c548f3aa5c185d67b7..c84b75cc1301055de700f4410b22550f6bbf3b6e 100644 (file)
--- a/Settings/SettingView/tizen-manifest.xml
+++ b/Settings/SettingView/tizen-manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="7" package="org.tizen.SettingView" version="1.0.0">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="7" package="org.tizen.SettingView" version="1.0.1">
   <profile name="common" />
   <ui-application appid="org.tizen.SettingView" exec="SettingView.dll" type="dotnet" multiple="false" taskmanage="true" nodisplay="false" launch_mode="single">
     <icon>SettingView.png</icon>

diff --git a/packaging/org.tizen.SettingView-1.0.0.tpk b/packaging/org.tizen.SettingView-1.0.0.tpk
deleted file mode 100644 (file)
index ecc165e..0000000
Binary files a/packaging/org.tizen.SettingView-1.0.0.tpk and /dev/null differ

diff --git a/packaging/org.tizen.SettingView-1.0.1.tpk b/packaging/org.tizen.SettingView-1.0.1.tpk
new file mode 100644 (file)
index 0000000..9a984d3
Binary files /dev/null and b/packaging/org.tizen.SettingView-1.0.1.tpk differ

diff --git a/packaging/org.tizen.cssetting-account-1.0.0.tpk b/packaging/org.tizen.cssetting-account-1.0.0.tpk
deleted file mode 100644 (file)
index f042c57..0000000
Binary files a/packaging/org.tizen.cssetting-account-1.0.0.tpk and /dev/null differ

diff --git a/packaging/org.tizen.cssetting-account-1.0.1.tpk b/packaging/org.tizen.cssetting-account-1.0.1.tpk
new file mode 100644 (file)
index 0000000..ca8f947
Binary files /dev/null and b/packaging/org.tizen.cssetting-account-1.0.1.tpk differ