From 14a716fa312631a7419cbc689b7a6a38e140c4a6 Mon Sep 17 00:00:00 2001
From: vakrilov <alexander.vakrilov@telerik.com>
Date: Fri, 17 Apr 2015 17:08:36 +0300
Subject: [PATCH 1/6] Fix: Border supports background

---
 CrossPlatformModules.csproj         |  9 +--
 apps/gallery-app/content/border.xml |  7 +++
 apps/gallery-app/main-page.xml      |  1 +
 ui/border/border-common.ts          |  4 ++
 ui/border/border.android.ts         | 88 +++++++++++++----------------
 ui/border/border.d.ts               |  4 ++
 ui/styling/stylers.android.ts       | 21 +++++++
 7 files changed, 81 insertions(+), 53 deletions(-)
 create mode 100644 apps/gallery-app/content/border.xml

diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index cd05937ca..a8b27225d 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -572,6 +572,7 @@
     <TypeScriptCompile Include="libjs.d.ts" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="apps\gallery-app\content\border.xml" />
     <Content Include="apps\pickers-demo\main-page.xml">
       <SubType>Designer</SubType>
     </Content>
@@ -722,9 +723,9 @@
       <SubType>Designer</SubType>
     </Content>
     <TypeScriptCompile Include="camera\camera.d.ts" />
-	<TypeScriptCompile Include="camera\camera-common.ts" >
-	  <DependentUpon>camera.d.ts</DependentUpon>
-	</TypeScriptCompile>
+    <TypeScriptCompile Include="camera\camera-common.ts">
+      <DependentUpon>camera.d.ts</DependentUpon>
+    </TypeScriptCompile>
     <TypeScriptCompile Include="camera\camera.android.ts">
       <DependentUpon>camera.d.ts</DependentUpon>
     </TypeScriptCompile>
@@ -1558,7 +1559,7 @@
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
-      <UserProperties ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" />
+      <UserProperties ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/apps/gallery-app/content/border.xml b/apps/gallery-app/content/border.xml
new file mode 100644
index 000000000..265858ba7
--- /dev/null
+++ b/apps/gallery-app/content/border.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Page>
+  <Border cornerRadius="20" borderWidth="4" borderColor="darkgray"
+      style="background-color: lightblue; margin:20;">
+    <Label verticalAlignment="center" horizontalAlignment="center" text="Content" />
+  </Border>
+</Page>
\ No newline at end of file
diff --git a/apps/gallery-app/main-page.xml b/apps/gallery-app/main-page.xml
index 1fb2fbcc0..5afa03258 100644
--- a/apps/gallery-app/main-page.xml
+++ b/apps/gallery-app/main-page.xml
@@ -16,6 +16,7 @@
         <Button tag="content/tab-view" text="TabView" tap="itemTap" />
         <Button tag="content/web-view" text="WebView" tap="itemTap" />
         <Button tag="content/scroll-view" text="ScrollView" tap="itemTap" />
+        <Button tag="content/border" text="Border" tap="itemTap" />
       </StackLayout>
 
       <Label cssClass="title" text="Views" />
diff --git a/ui/border/border-common.ts b/ui/border/border-common.ts
index 563b16ccd..d516ebe48 100644
--- a/ui/border/border-common.ts
+++ b/ui/border/border-common.ts
@@ -81,4 +81,8 @@ export class Border extends contentView.ContentView implements definition.Border
         var borderSize = this.borderWidth * density;
         viewModule.View.layoutChild(this, this.content, borderSize, borderSize, right - left - borderSize, bottom - top - borderSize);
     }
+
+    public _updateAndroidBorder() {
+        // This is android specific method.
+    }
 }
\ No newline at end of file
diff --git a/ui/border/border.android.ts b/ui/border/border.android.ts
index e75d152ff..557493399 100644
--- a/ui/border/border.android.ts
+++ b/ui/border/border.android.ts
@@ -1,63 +1,53 @@
 import borderCommon = require("ui/border/border-common");
 import proxy = require("ui/core/proxy");
+import view = require("ui/core/view");
 import dependencyObservable = require("ui/core/dependency-observable");
 import color = require("color");
+import utils = require("utils/utils");
 
 // merge the exports of the common file with the exports of this file
 declare var exports;
 require("utils/module-merge").merge(borderCommon, exports);
 
-function onCornerRadiusPropertyChanged(data: dependencyObservable.PropertyChangeData) {
-    var view = <Border>data.object;
-    if (!view._nativeView) {
-        return;
-    }
-
-    if (view._nativeView instanceof android.view.ViewGroup) {
-        var gd = new android.graphics.drawable.GradientDrawable();
-
-        gd.setCornerRadius(data.newValue);
-        gd.setStroke(view.borderWidth, view.borderColor.android);
-
-        (<android.view.View>view._nativeView).setBackgroundDrawable(gd);
-    }
+function onBorderPropertyChanged(data: dependencyObservable.PropertyChangeData) {
+    var border = <Border>data.object;
+    border._updateAndroidBorder();
 }
-(<proxy.PropertyMetadata>borderCommon.Border.cornerRadiusProperty.metadata).onSetNativeValue = onCornerRadiusPropertyChanged;
 
-function onBorderWidthPropertyChanged(data: dependencyObservable.PropertyChangeData) {
-    var view = <Border>data.object;
-    if (!view._nativeView) {
-        return;
-    }
-
-    if (view._nativeView instanceof android.view.ViewGroup) {
-        var gd = new android.graphics.drawable.GradientDrawable();
-
-        gd.setCornerRadius(view.cornerRadius);
-        gd.setStroke(data.newValue, view.borderColor.android);
-
-        (<android.view.View>view._nativeView).setBackgroundDrawable(gd);
-    }
-}
-(<proxy.PropertyMetadata>borderCommon.Border.borderWidthProperty.metadata).onSetNativeValue = onBorderWidthPropertyChanged;
-
-function onBorderColorPropertyChanged(data: dependencyObservable.PropertyChangeData) {
-    var view = <Border>data.object;
-    if (!view._nativeView) {
-        return;
-    }
-
-    if (view._nativeView instanceof android.view.ViewGroup && data.newValue instanceof color.Color) {
-        var gd = new android.graphics.drawable.GradientDrawable();
-
-        gd.setCornerRadius(view.cornerRadius);
-        gd.setStroke(view.borderWidth, data.newValue.android);
-
-        (<android.view.View>view._nativeView).setBackgroundDrawable(gd);
-    }
-}
-(<proxy.PropertyMetadata>borderCommon.Border.borderColorProperty.metadata).onSetNativeValue = onBorderColorPropertyChanged;
+(<proxy.PropertyMetadata>borderCommon.Border.cornerRadiusProperty.metadata).onSetNativeValue = onBorderPropertyChanged;
+(<proxy.PropertyMetadata>borderCommon.Border.borderWidthProperty.metadata).onSetNativeValue = onBorderPropertyChanged;
+(<proxy.PropertyMetadata>borderCommon.Border.borderColorProperty.metadata).onSetNativeValue = onBorderPropertyChanged;
 
 export class Border extends borderCommon.Border {
-    //
+    public _updateAndroidBorder() {
+        if (!this._nativeView) {
+            return;
+        }
+
+        var nativeView = <android.view.ViewGroup>this._nativeView;
+
+        var backgroundDrawable = nativeView.getBackground();
+        if (!(backgroundDrawable instanceof android.graphics.drawable.GradientDrawable)) {
+            backgroundDrawable = new android.graphics.drawable.GradientDrawable();
+            nativeView.setBackgroundDrawable(backgroundDrawable);
+        }
+
+        var gd = <android.graphics.drawable.GradientDrawable>backgroundDrawable;
+        var density = utils.layout.getDisplayDensity();
+        gd.setCornerRadius(this.cornerRadius * density);
+
+        if (this.borderColor) {
+            gd.setStroke(this.borderWidth * density, this.borderColor.android);
+        }
+        else {
+            gd.setStroke(this.borderWidth * density, android.graphics.Color.TRANSPARENT);
+        }
+
+        if (this.backgroundColor) {
+            gd.setColor(this.backgroundColor.android);
+        }
+        else {
+            gd.setColor(android.graphics.Color.TRANSPARENT);
+        }
+    }
 } 
\ No newline at end of file
diff --git a/ui/border/border.d.ts b/ui/border/border.d.ts
index 5293676c0..6f8770306 100644
--- a/ui/border/border.d.ts
+++ b/ui/border/border.d.ts
@@ -28,5 +28,9 @@ declare module "ui/border" {
          * Gets or sets the border color of the border component.
          */
         borderColor: color.Color;
+
+        //@private
+        _updateAndroidBorder();
+        //@endprivate
     }
 }
\ No newline at end of file
diff --git a/ui/styling/stylers.android.ts b/ui/styling/stylers.android.ts
index 4f4c9f129..2084ad276 100644
--- a/ui/styling/stylers.android.ts
+++ b/ui/styling/stylers.android.ts
@@ -1,6 +1,7 @@
 import types = require("utils/types");
 import trace = require("trace");
 import view = require("ui/core/view");
+import border = require("ui/border");
 import constants = require("utils/android_constants");
 import style = require("ui/styling/style");
 import definition = require("ui/styling");
@@ -343,6 +344,25 @@ export class SearchBarStyler implements definition.stylers.Styler {
     }
 }
 
+export class BorderStyler implements definition.stylers.Styler {
+    //Background methods
+    private static setBackgroundProperty(view: view.View, newValue: any) {
+        var border = <border.Border>view;
+        border._updateAndroidBorder();
+    }
+
+    private static resetBackgroundProperty(view: view.View, nativeValue: any) {
+        var border = <border.Border>view;
+        border._updateAndroidBorder();
+    }
+
+   public static registerHandlers() {
+        style.registerHandler(style.backgroundColorProperty, new stylersCommon.StylePropertyChangedHandler(
+            BorderStyler.setBackgroundProperty,
+            BorderStyler.resetBackgroundProperty), "Border");
+    }
+}
+
 export function _registerDefaultStylers() {
     style.registerNoStylingClass("Frame");
     DefaultStyler.registerHandlers();
@@ -351,4 +371,5 @@ export function _registerDefaultStylers() {
     ActivityIndicatorStyler.registerHandlers();
     SegmentedBarStyler.registerHandlers();
     SearchBarStyler.registerHandlers();
+    BorderStyler.registerHandlers();
 }

From acb6e92789d6a600661ecb88b7a98e08783fc023 Mon Sep 17 00:00:00 2001
From: vakrilov <alexander.vakrilov@telerik.com>
Date: Fri, 17 Apr 2015 18:33:50 +0300
Subject: [PATCH 2/6] Pickers and segmented bar added to gallery

---
 CrossPlatformModules.csproj              | 17 ++++++++++++++---
 apps/gallery-app/main-page.xml           |  4 ++++
 apps/gallery-app/views/date-picker.xml   |  4 ++++
 apps/gallery-app/views/image.ts          | 10 ----------
 apps/gallery-app/views/image.xml         |  2 +-
 apps/gallery-app/views/list-picker.ts    | 10 ++++++++++
 apps/gallery-app/views/list-picker.xml   |  5 +++++
 apps/gallery-app/views/segmented-bar.xml | 10 ++++++++++
 apps/gallery-app/views/time-picker.xml   |  4 ++++
 9 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 apps/gallery-app/views/date-picker.xml
 delete mode 100644 apps/gallery-app/views/image.ts
 create mode 100644 apps/gallery-app/views/list-picker.ts
 create mode 100644 apps/gallery-app/views/list-picker.xml
 create mode 100644 apps/gallery-app/views/segmented-bar.xml
 create mode 100644 apps/gallery-app/views/time-picker.xml

diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index a8b27225d..8c177ed60 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -60,6 +60,15 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
   <ItemGroup>
+    <TypeScriptCompile Include="apps\gallery-app\views\list-picker.ts">
+      <DependentUpon>list-picker.xml</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="apps\gallery-app\views\placeholder.ios.ts">
+      <DependentUpon>placeholder.xml</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="apps\gallery-app\views\placeholder.android.ts">
+      <DependentUpon>placeholder.xml</DependentUpon>
+    </TypeScriptCompile>
     <TypeScriptCompile Include="apps\pickers-demo\app.ts" />
     <TypeScriptCompile Include="apps\pickers-demo\main-page.ts">
       <DependentUpon>main-page.xml</DependentUpon>
@@ -72,9 +81,6 @@
     <TypeScriptCompile Include="apps\gallery-app\views\list-view.ts">
       <DependentUpon>list-view.xml</DependentUpon>
     </TypeScriptCompile>
-    <TypeScriptCompile Include="apps\gallery-app\views\image.ts">
-      <DependentUpon>image.xml</DependentUpon>
-    </TypeScriptCompile>
     <TypeScriptCompile Include="apps\placeholder-demo\app.ts" />
     <TypeScriptCompile Include="apps\placeholder-demo\main-page.android.ts">
       <DependentUpon>main-page.xml</DependentUpon>
@@ -573,6 +579,11 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="apps\gallery-app\content\border.xml" />
+    <Content Include="apps\gallery-app\views\list-picker.xml" />
+    <Content Include="apps\gallery-app\views\placeholder.xml" />
+    <Content Include="apps\gallery-app\views\segmented-bar.xml" />
+    <Content Include="apps\gallery-app\views\time-picker.xml" />
+    <Content Include="apps\gallery-app\views\date-picker.xml" />
     <Content Include="apps\pickers-demo\main-page.xml">
       <SubType>Designer</SubType>
     </Content>
diff --git a/apps/gallery-app/main-page.xml b/apps/gallery-app/main-page.xml
index 5afa03258..3240e80fa 100644
--- a/apps/gallery-app/main-page.xml
+++ b/apps/gallery-app/main-page.xml
@@ -33,6 +33,10 @@
         <Button tag="views/search-bar" text="SearchBar" tap="itemTap" />
         <Button tag="views/list-view" text="ListView" tap="itemTap" />
         <Button tag="views/dialogs" text="Dialogs" tap="itemTap" />
+        <Button tag="views/date-picker" text="DatePicker" tap="itemTap" />
+        <Button tag="views/time-picker" text="TimePicker" tap="itemTap" />
+        <Button tag="views/list-picker" text="ListPicker" tap="itemTap" />
+        <Button tag="views/segmented-bar" text="SegmentedBar" tap="itemTap" />
       </StackLayout>
     </StackLayout>
   </ScrollView>
diff --git a/apps/gallery-app/views/date-picker.xml b/apps/gallery-app/views/date-picker.xml
new file mode 100644
index 000000000..d10061124
--- /dev/null
+++ b/apps/gallery-app/views/date-picker.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Page>
+  <DatePicker day="15" month="5" year="2015" verticalAlignment="center" horizontalAlignment="center"/>
+</Page>
diff --git a/apps/gallery-app/views/image.ts b/apps/gallery-app/views/image.ts
deleted file mode 100644
index bb935ed8e..000000000
--- a/apps/gallery-app/views/image.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import fs = require("file-system");
-import imageSource = require("image-source");
-
-export function pageLoaded(args) {
-    var page = args.object;
-    
-    var telerikLogo = imageSource.fromFile(fs.path.join(__dirname, "../res/telerik-logo.png"));
-
-    page.bindingContext = { imageSource: telerikLogo };
-}
\ No newline at end of file
diff --git a/apps/gallery-app/views/image.xml b/apps/gallery-app/views/image.xml
index da1c2057d..8bbc3452d 100644
--- a/apps/gallery-app/views/image.xml
+++ b/apps/gallery-app/views/image.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<Page loaded="pageLoaded">
+<Page>
   <Image margin="10" src="~/res/telerik-logo.png" verticalAlignment="center" horizontalAlignment="center"/>
 </Page>
diff --git a/apps/gallery-app/views/list-picker.ts b/apps/gallery-app/views/list-picker.ts
new file mode 100644
index 000000000..7eafe246a
--- /dev/null
+++ b/apps/gallery-app/views/list-picker.ts
@@ -0,0 +1,10 @@
+import pages = require("ui/page");
+import observableModule = require("data/observable");
+
+export function onPageLoaded(args: observableModule.EventData) {
+    var page = <pages.Page>args.object;
+    page.bindingContext = {
+        items: ["Item 1", "Item 2", "Item 3", "Item 4", "Item 5"],
+        selectedIndex: 2
+    };
+}
\ No newline at end of file
diff --git a/apps/gallery-app/views/list-picker.xml b/apps/gallery-app/views/list-picker.xml
new file mode 100644
index 000000000..78bb5d5c1
--- /dev/null
+++ b/apps/gallery-app/views/list-picker.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Page loaded="onPageLoaded">
+  <ListPicker items="{{ items }}" selectedIndex="{{ selectedIndex }}"
+              verticalAlignment="center" horizontalAlignment="center"/>
+</Page>
diff --git a/apps/gallery-app/views/segmented-bar.xml b/apps/gallery-app/views/segmented-bar.xml
new file mode 100644
index 000000000..400d623f3
--- /dev/null
+++ b/apps/gallery-app/views/segmented-bar.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Page>
+  <SegmentedBar style="vertical-align: center; margin: 20; background-color: lightblue;">
+    <SegmentedBar.items>
+      <SegmentedBarItem title="Item 1" />
+      <SegmentedBarItem title="Item 2" />
+      <SegmentedBarItem title="Item 3" />
+    </SegmentedBar.items>
+  </SegmentedBar>
+</Page>
\ No newline at end of file
diff --git a/apps/gallery-app/views/time-picker.xml b/apps/gallery-app/views/time-picker.xml
new file mode 100644
index 000000000..8ddadb6a5
--- /dev/null
+++ b/apps/gallery-app/views/time-picker.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Page>
+  <TimePicker hour="18" minute="30" verticalAlignment="center" horizontalAlignment="center"/>
+</Page>

From ac318f11728de96a2a764eb52a9f490a842af071 Mon Sep 17 00:00:00 2001
From: vakrilov <alexander.vakrilov@telerik.com>
Date: Mon, 20 Apr 2015 14:00:09 +0300
Subject: [PATCH 3/6] Styles moved to app.css

---
 CrossPlatformModules.csproj                 | 13 ++-----------
 apps/gallery-app/{main-page.css => app.css} |  0
 apps/gallery-app/app.ts                     |  4 ++++
 3 files changed, 6 insertions(+), 11 deletions(-)
 rename apps/gallery-app/{main-page.css => app.css} (100%)

diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index 8c177ed60..ad7e5626a 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -63,12 +63,6 @@
     <TypeScriptCompile Include="apps\gallery-app\views\list-picker.ts">
       <DependentUpon>list-picker.xml</DependentUpon>
     </TypeScriptCompile>
-    <TypeScriptCompile Include="apps\gallery-app\views\placeholder.ios.ts">
-      <DependentUpon>placeholder.xml</DependentUpon>
-    </TypeScriptCompile>
-    <TypeScriptCompile Include="apps\gallery-app\views\placeholder.android.ts">
-      <DependentUpon>placeholder.xml</DependentUpon>
-    </TypeScriptCompile>
     <TypeScriptCompile Include="apps\pickers-demo\app.ts" />
     <TypeScriptCompile Include="apps\pickers-demo\main-page.ts">
       <DependentUpon>main-page.xml</DependentUpon>
@@ -579,8 +573,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="apps\gallery-app\content\border.xml" />
+    <Content Include="apps\gallery-app\app.css" />
     <Content Include="apps\gallery-app\views\list-picker.xml" />
-    <Content Include="apps\gallery-app\views\placeholder.xml" />
     <Content Include="apps\gallery-app\views\segmented-bar.xml" />
     <Content Include="apps\gallery-app\views\time-picker.xml" />
     <Content Include="apps\gallery-app\views\date-picker.xml" />
@@ -773,9 +767,6 @@
     <Content Include="apps\gallery-app\layouts\wrap-layout.xml" />
     <Content Include="apps\gallery-app\layouts\grid-layout.xml" />
     <Content Include="apps\gallery-app\layouts\stack-layout.xml" />
-    <Content Include="apps\gallery-app\main-page.css">
-      <DependentUpon>main-page.xml</DependentUpon>
-    </Content>
     <Content Include="apps\gallery-app\main-page.xml" />
     <Content Include="apps\gallery-app\content\tab-view.xml" />
     <TypeScriptCompile Include="apps\gallery-app\views\dialogs.ts">
@@ -1570,7 +1561,7 @@
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
-      <UserProperties ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" />
+      <UserProperties ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/apps/gallery-app/main-page.css b/apps/gallery-app/app.css
similarity index 100%
rename from apps/gallery-app/main-page.css
rename to apps/gallery-app/app.css
diff --git a/apps/gallery-app/app.ts b/apps/gallery-app/app.ts
index cb572300b..519a85d36 100644
--- a/apps/gallery-app/app.ts
+++ b/apps/gallery-app/app.ts
@@ -1,3 +1,7 @@
 import application = require("application");
 application.mainModule = "main-page";
+
+// Needed only for build infrastructure
+application.cssFile = "app.css";
+
 application.start();

From 3bc025633b03ab03d4fef74d41d7dc10ecf39af7 Mon Sep 17 00:00:00 2001
From: vakrilov <alexander.vakrilov@telerik.com>
Date: Mon, 20 Apr 2015 15:57:11 +0300
Subject: [PATCH 4/6] Pickers fixes and tests

---
 .../date-picker-tests-native.android.ts       |  4 +
 .../date-picker/date-picker-tests-native.d.ts |  4 +-
 .../date-picker-tests-native.ios.ts           |  9 +-
 .../tests/ui/date-picker/date-picker-tests.ts | 96 ++++++++++++++++---
 .../time-picker-tests-native.android.ts       |  5 +
 .../time-picker/time-picker-tests-native.d.ts |  4 +-
 .../time-picker-tests-native.ios.ts           |  8 ++
 .../tests/ui/time-picker/time-picker-tests.ts | 67 +++++++++++--
 ui/date-picker/date-picker.android.ts         | 17 +++-
 ui/time-picker/time-picker.android.ts         | 45 ++++++---
 10 files changed, 219 insertions(+), 40 deletions(-)

diff --git a/apps/tests/ui/date-picker/date-picker-tests-native.android.ts b/apps/tests/ui/date-picker/date-picker-tests-native.android.ts
index f44f9481b..e8326514b 100644
--- a/apps/tests/ui/date-picker/date-picker-tests-native.android.ts
+++ b/apps/tests/ui/date-picker/date-picker-tests-native.android.ts
@@ -31,3 +31,7 @@ export function setNativeMonth(datePicker: datePickerModule.DatePicker, value: n
 export function setNativeDay(datePicker: datePickerModule.DatePicker, value: number): void {
     datePicker.android.updateDate(datePicker.android.getYear(), datePicker.android.getMonth(), value);
 }
+
+export function setNativeDate(datePicker: datePickerModule.DatePicker, year: number, month: number, day: number): void {
+    datePicker.android.updateDate(year, month - 1, day);
+}
\ No newline at end of file
diff --git a/apps/tests/ui/date-picker/date-picker-tests-native.d.ts b/apps/tests/ui/date-picker/date-picker-tests-native.d.ts
index 6cc8e0556..d27549c13 100644
--- a/apps/tests/ui/date-picker/date-picker-tests-native.d.ts
+++ b/apps/tests/ui/date-picker/date-picker-tests-native.d.ts
@@ -9,4 +9,6 @@ export declare function getNativeMinDate(datePicker: datePickerModule.DatePicker
 
 export declare function setNativeYear(datePicker: datePickerModule.DatePicker, value: number): void;
 export declare function setNativeMonth(datePicker: datePickerModule.DatePicker, value: number): void;
-export declare function setNativeDay(datePicker: datePickerModule.DatePicker, value: number): void;
\ No newline at end of file
+export declare function setNativeDay(datePicker: datePickerModule.DatePicker, value: number): void;
+
+export declare function setNativeDate(datePicker: datePickerModule.DatePicker, year: number, month: number, day: number): void;
\ No newline at end of file
diff --git a/apps/tests/ui/date-picker/date-picker-tests-native.ios.ts b/apps/tests/ui/date-picker/date-picker-tests-native.ios.ts
index 6cc54d7b6..d8407e8c5 100644
--- a/apps/tests/ui/date-picker/date-picker-tests-native.ios.ts
+++ b/apps/tests/ui/date-picker/date-picker-tests-native.ios.ts
@@ -41,4 +41,11 @@ export function setNativeDay(datePicker: datePickerModule.DatePicker, value: num
     (<any>datePicker)._changeHandler.valueChanged(datePicker.ios);
 }
 
-    
\ No newline at end of file
+export function setNativeDate(datePicker: datePickerModule.DatePicker, year: number, month: number, day: number): void {
+    var comps = NSCalendar.currentCalendar().componentsFromDate(NSCalendarUnit.NSCalendarUnitYear | NSCalendarUnit.NSCalendarUnitMonth | NSCalendarUnit.NSCalendarUnitDay, datePicker.ios.date);
+    comps.year = year;
+    comps.month = month;
+    comps.day = day;
+    datePicker.ios.setDateAnimated(NSCalendar.currentCalendar().dateFromComponents(comps), false);
+    (<any>datePicker)._changeHandler.valueChanged(datePicker.ios);
+}   
\ No newline at end of file
diff --git a/apps/tests/ui/date-picker/date-picker-tests.ts b/apps/tests/ui/date-picker/date-picker-tests.ts
index e596c7b2d..ca75f4adc 100644
--- a/apps/tests/ui/date-picker/date-picker-tests.ts
+++ b/apps/tests/ui/date-picker/date-picker-tests.ts
@@ -11,7 +11,7 @@ import datePickerModule = require("ui/date-picker");
 // ```
 // </snippet>
 
-function _createDatePicker(): datePickerModule.DatePicker {
+function _createDatePicker(year?: number, month?: number, day?: number): datePickerModule.DatePicker {
     // <snippet module="ui/date-picker" title="DatePicker">
     // ## Creating a DatePicker
     // ``` JavaScript
@@ -19,10 +19,23 @@ function _createDatePicker(): datePickerModule.DatePicker {
     // ```
     // </snippet>
     datePicker.id = "DatePicker";
+
+    if (year) {
+        datePicker.year = year;
+    }
+
+    if (month) {
+        datePicker.month = month;
+    }
+
+    if (day) {
+        datePicker.day = day;
+    }
+
     return datePicker;
 }
 
-export var test_DummyForCodeSnippet = function () {
+export function test_DummyForCodeSnippet() {
     helper.buildUIAndRunTest(_createDatePicker(), function (views: Array<viewModule.View>) {
         var datePicker = <datePickerModule.DatePicker>views[0];
         // <snippet module="ui/date-picker" title="DatePicker">
@@ -38,7 +51,7 @@ export var test_DummyForCodeSnippet = function () {
     });
 }
 
-export var test_WhenCreated_YearIsUndefined = function () {
+export function test_WhenCreated_YearIsUndefined() {
     helper.buildUIAndRunTest(_createDatePicker(), function (views: Array<viewModule.View>) {
         var datePicker = <datePickerModule.DatePicker>views[0];
         var actualValue = datePicker.year;
@@ -47,7 +60,7 @@ export var test_WhenCreated_YearIsUndefined = function () {
     });
 }
 
-export var test_WhenCreated_MonthIsUndefined = function () {
+export function test_WhenCreated_MonthIsUndefined() {
     helper.buildUIAndRunTest(_createDatePicker(), function (views: Array<viewModule.View>) {
         var datePicker = <datePickerModule.DatePicker>views[0];
         var actualValue = datePicker.month;
@@ -56,7 +69,7 @@ export var test_WhenCreated_MonthIsUndefined = function () {
     });
 }
 
-export var test_WhenCreated_DayIsUndefined = function () {
+export function test_WhenCreated_DayIsUndefined() {
     helper.buildUIAndRunTest(_createDatePicker(), function (views: Array<viewModule.View>) {
         var datePicker = <datePickerModule.DatePicker>views[0];
         var actualValue = datePicker.day;
@@ -65,7 +78,7 @@ export var test_WhenCreated_DayIsUndefined = function () {
     });
 }
 
-export var testYearFromLocalToNative = function () {
+export function testYearFromLocalToNative() {
     helper.buildUIAndRunTest(_createDatePicker(), function (views: Array<viewModule.View>) {
         var datePicker = <datePickerModule.DatePicker>views[0];
         var expectedValue = 1980;
@@ -75,7 +88,7 @@ export var testYearFromLocalToNative = function () {
     });
 }
 
-export var testMonthFromLocalToNative = function () {
+export function testMonthFromLocalToNative() {
     helper.buildUIAndRunTest(_createDatePicker(), function (views: Array<viewModule.View>) {
         var datePicker = <datePickerModule.DatePicker>views[0];
         var expectedValue = 5;
@@ -85,7 +98,7 @@ export var testMonthFromLocalToNative = function () {
     });
 }
 
-export var testDayFromLocalToNative = function () {
+export function testDayFromLocalToNative() {
     helper.buildUIAndRunTest(_createDatePicker(), function (views: Array<viewModule.View>) {
         var datePicker = <datePickerModule.DatePicker>views[0];
         var expectedValue = 19;
@@ -95,7 +108,7 @@ export var testDayFromLocalToNative = function () {
     });
 }
 
-export var testMaxDateFromLocalToNative = function () {
+export function testMaxDateFromLocalToNative() {
     helper.buildUIAndRunTest(_createDatePicker(), function (views: Array<viewModule.View>) {
         var datePicker = <datePickerModule.DatePicker>views[0];
         var expectedValue = new Date(1980, 1, 9);
@@ -105,7 +118,7 @@ export var testMaxDateFromLocalToNative = function () {
     });
 }
 
-export var testMinDateFromLocalToNative = function () {
+export function testMinDateFromLocalToNative() {
     helper.buildUIAndRunTest(_createDatePicker(), function (views: Array<viewModule.View>) {
         var datePicker = <datePickerModule.DatePicker>views[0];
         var expectedValue = new Date(1980, 1, 9);
@@ -115,7 +128,7 @@ export var testMinDateFromLocalToNative = function () {
     });
 }
 
-export var testYearFromNativeToLocal = function () {
+export function testYearFromNativeToLocal() {
     helper.buildUIAndRunTest(_createDatePicker(), function (views: Array<viewModule.View>) {
         var datePicker = <datePickerModule.DatePicker>views[0];
         var expectedValue = 1981;
@@ -125,7 +138,7 @@ export var testYearFromNativeToLocal = function () {
     });
 }
 
-export var testMonthFromNativeToLocal = function () {
+export function testMonthFromNativeToLocal() {
     helper.buildUIAndRunTest(_createDatePicker(), function (views: Array<viewModule.View>) {
         var datePicker = <datePickerModule.DatePicker>views[0];
         var expectedValue = 6;
@@ -135,7 +148,19 @@ export var testMonthFromNativeToLocal = function () {
     });
 }
 
-export var testDayFromNativeToLocal = function () {
+export function testYearMonthDayFromNativeToLocal() {
+    var testYear = 2000;
+    var testMonth = 3;
+    var testDay = 24;
+
+    helper.buildUIAndRunTest(_createDatePicker(), function (views: Array<viewModule.View>) {
+        var datePicker = <datePickerModule.DatePicker>views[0];
+        datePickerTestsNative.setNativeDate(datePicker, testYear, testMonth, testDay);
+        assertDate(datePicker, testYear, testMonth, testDay);
+    });
+}
+
+export function testDayFromNativeToLocal() {
     helper.buildUIAndRunTest(_createDatePicker(), function (views: Array<viewModule.View>) {
         var datePicker = <datePickerModule.DatePicker>views[0];
         var expectedValue = 20;
@@ -145,7 +170,50 @@ export var testDayFromNativeToLocal = function () {
     });
 }
 
-//export var testWTF = function () {
+export function testSetYearMonthDay_BeforeLoaded() {
+    var testYear = 2000;
+    var testMonth = 3;
+    var testDay = 24;
+
+    helper.buildUIAndRunTest(_createDatePicker(testYear, testMonth, testDay), function (views: Array<viewModule.View>) {
+        var datePicker = <datePickerModule.DatePicker>views[0];
+
+        TKUnit.assertEqual(datePicker.year, testYear, "datePicker.year");
+        TKUnit.assertEqual(datePicker.month, testMonth, "datePicker.month");
+        TKUnit.assertEqual(datePicker.day, testDay, "datePicker.day");
+
+        TKUnit.assertEqual(datePickerTestsNative.getNativeYear(datePicker), testYear, "Native datePicker.year");
+        TKUnit.assertEqual(datePickerTestsNative.getNativeMonth(datePicker), testMonth, "Native datePicker.month");
+        TKUnit.assertEqual(datePickerTestsNative.getNativeDay(datePicker), testDay, "Native datePicker.day");
+    });
+}
+
+export function testSetYearMonthDay_AfterLoaded() {
+    var testYear = 2000;
+    var testMonth = 3;
+    var testDay = 24;
+
+    helper.buildUIAndRunTest(_createDatePicker(), function (views: Array<viewModule.View>) {
+        var datePicker = <datePickerModule.DatePicker>views[0];
+        datePicker.year = testYear;
+        datePicker.month = testMonth;
+        datePicker.day = testDay;        
+
+        assertDate(datePicker, testYear, testMonth, testDay);
+    });
+}
+
+function assertDate(datePicker: datePickerModule.DatePicker, expectedYear: number, expectedMonth: number, expectedDay: number) {
+    TKUnit.assertEqual(datePicker.year, expectedYear, "datePicker.year");
+    TKUnit.assertEqual(datePicker.month, expectedMonth, "datePicker.month");
+    TKUnit.assertEqual(datePicker.day, expectedDay, "datePicker.day");
+
+    TKUnit.assertEqual(datePickerTestsNative.getNativeYear(datePicker), expectedYear, "Native datePicker.year");
+    TKUnit.assertEqual(datePickerTestsNative.getNativeMonth(datePicker), expectedMonth, "Native datePicker.month");
+    TKUnit.assertEqual(datePickerTestsNative.getNativeDay(datePicker), expectedDay, "Native datePicker.day");
+}
+
+//export function testWTF() {
 //    var picker = new UIDatePicker();
 //    picker.datePickerMode = UIDatePickerMode.UIDatePickerModeDate;
 //    var jsDate = new Date(1980, 1, 9);
diff --git a/apps/tests/ui/time-picker/time-picker-tests-native.android.ts b/apps/tests/ui/time-picker/time-picker-tests-native.android.ts
index 290c7f1dd..ce5d7459f 100644
--- a/apps/tests/ui/time-picker/time-picker-tests-native.android.ts
+++ b/apps/tests/ui/time-picker/time-picker-tests-native.android.ts
@@ -14,4 +14,9 @@ export function setNativeHour(timePicker: timePickerModule.TimePicker, value: nu
 
 export function setNativeMinute(timePicker: timePickerModule.TimePicker, value: number): void {
     timePicker.android.setCurrentMinute(new java.lang.Integer(value));
+}
+
+export function setNativeTime(timePicker: timePickerModule.TimePicker, hour: number, minute: number): void {
+    timePicker.android.setCurrentHour(new java.lang.Integer(hour));
+    timePicker.android.setCurrentMinute(new java.lang.Integer(minute));
 }
\ No newline at end of file
diff --git a/apps/tests/ui/time-picker/time-picker-tests-native.d.ts b/apps/tests/ui/time-picker/time-picker-tests-native.d.ts
index 41f6a61a9..d623430a3 100644
--- a/apps/tests/ui/time-picker/time-picker-tests-native.d.ts
+++ b/apps/tests/ui/time-picker/time-picker-tests-native.d.ts
@@ -5,4 +5,6 @@ export declare function getNativeHour(timePicker: timePickerModule.TimePicker):
 export declare function getNativeMinute(timePicker: timePickerModule.TimePicker): number;
 
 export declare function setNativeHour(timePicker: timePickerModule.TimePicker, value: number): void;
-export declare function setNativeMinute(timePicker: timePickerModule.TimePicker, value: number): void;
\ No newline at end of file
+export declare function setNativeMinute(timePicker: timePickerModule.TimePicker, value: number): void;
+
+export declare function setNativeTime(timePicker: timePickerModule.TimePicker, hour: number, minute: number): void;
\ No newline at end of file
diff --git a/apps/tests/ui/time-picker/time-picker-tests-native.ios.ts b/apps/tests/ui/time-picker/time-picker-tests-native.ios.ts
index c59cf3c92..5a4e8d2ae 100644
--- a/apps/tests/ui/time-picker/time-picker-tests-native.ios.ts
+++ b/apps/tests/ui/time-picker/time-picker-tests-native.ios.ts
@@ -21,4 +21,12 @@ export function setNativeMinute(timePicker: timePickerModule.TimePicker, value:
     timePicker.ios.setDateAnimated(NSCalendar.currentCalendar().dateFromComponents(comps), false);
     (<any>timePicker)._changeHandler.valueChanged(timePicker.ios);
 }
+
+export function setNativeTime(timePicker: timePickerModule.TimePicker, hour: number, minute: number): void {
+    var comps = NSCalendar.currentCalendar().componentsFromDate(NSCalendarUnit.NSCalendarUnitHour | NSCalendarUnit.NSCalendarUnitMinute, timePicker.ios.date);
+    comps.hour = hour;
+    comps.minute = minute;
+    timePicker.ios.setDateAnimated(NSCalendar.currentCalendar().dateFromComponents(comps), false);
+    (<any>timePicker)._changeHandler.valueChanged(timePicker.ios);
+}
     
\ No newline at end of file
diff --git a/apps/tests/ui/time-picker/time-picker-tests.ts b/apps/tests/ui/time-picker/time-picker-tests.ts
index d921454a9..c35ea6e13 100644
--- a/apps/tests/ui/time-picker/time-picker-tests.ts
+++ b/apps/tests/ui/time-picker/time-picker-tests.ts
@@ -11,7 +11,7 @@ import timePickerModule = require("ui/time-picker");
 // ```
 // </snippet>
 
-function _createTimePicker(): timePickerModule.TimePicker {
+function _createTimePicker(hour?: number, minute?: number): timePickerModule.TimePicker {
     // <snippet module="ui/time-picker" title="TimePicker">
     // ## Creating a TimePicker
     // ``` JavaScript
@@ -19,10 +19,19 @@ function _createTimePicker(): timePickerModule.TimePicker {
     // ```
     // </snippet>
     timePicker.id = "timePicker";
+
+    if (hour) {
+        timePicker.hour = hour;
+    }
+
+    if (minute) {
+        timePicker.minute = minute;
+    }
+    
     return timePicker;
 }
 
-export var test_DummyForCodeSnippet = function () {
+export function test_DummyForCodeSnippet() {
     helper.buildUIAndRunTest(_createTimePicker(), function (views: Array<viewModule.View>) {
         var timePicker = <timePickerModule.TimePicker>views[0];
         // <snippet module="ui/time-picker" title="TimePicker">
@@ -35,7 +44,7 @@ export var test_DummyForCodeSnippet = function () {
     });
 }
 
-export var test_WhenCreated_HourIsUndefined = function () {
+export function test_WhenCreated_HourIsUndefined() {
     helper.buildUIAndRunTest(_createTimePicker(), function (views: Array<viewModule.View>) {
         var timePicker = <timePickerModule.TimePicker>views[0];
         var actualValue = timePicker.hour;
@@ -44,7 +53,7 @@ export var test_WhenCreated_HourIsUndefined = function () {
     });
 }
 
-export var test_WhenCreated_MinuteIsUndefined = function () {
+export function test_WhenCreated_MinuteIsUndefined() {
     helper.buildUIAndRunTest(_createTimePicker(), function (views: Array<viewModule.View>) {
         var timePicker = <timePickerModule.TimePicker>views[0];
         var actualValue = timePicker.minute;
@@ -53,7 +62,7 @@ export var test_WhenCreated_MinuteIsUndefined = function () {
     });
 }
 
-export var testHourFromLocalToNative = function () {
+export function testHourFromLocalToNative() {
     helper.buildUIAndRunTest(_createTimePicker(), function (views: Array<viewModule.View>) {
         var timePicker = <timePickerModule.TimePicker>views[0];
         var expectedValue = 13;
@@ -63,7 +72,7 @@ export var testHourFromLocalToNative = function () {
     });
 }
 
-export var testMinuteFromLocalToNative = function () {
+export function testMinuteFromLocalToNative() {
     helper.buildUIAndRunTest(_createTimePicker(), function (views: Array<viewModule.View>) {
         var timePicker = <timePickerModule.TimePicker>views[0];
         var expectedValue = 59;
@@ -73,7 +82,7 @@ export var testMinuteFromLocalToNative = function () {
     });
 }
 
-export var testHourFromNativeToLocal = function () {
+export function testHourFromNativeToLocal() {
     helper.buildUIAndRunTest(_createTimePicker(), function (views: Array<viewModule.View>) {
         var timePicker = <timePickerModule.TimePicker>views[0];
         var expectedValue = 14;
@@ -83,7 +92,7 @@ export var testHourFromNativeToLocal = function () {
     });
 }
 
-export var testMinuteFromNativeToLocal = function () {
+export function testMinuteFromNativeToLocal() {
     helper.buildUIAndRunTest(_createTimePicker(), function (views: Array<viewModule.View>) {
         var timePicker = <timePickerModule.TimePicker>views[0];
         var expectedValue = 33;
@@ -91,4 +100,46 @@ export var testMinuteFromNativeToLocal = function () {
         var actualValue = timePicker.minute;
         TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue);
     });
+}
+
+export function testHourAndMinuteFromNativeToLocal() {
+    var expectedHour = 12;
+    var expectedMinute = 34;
+
+    helper.buildUIAndRunTest(_createTimePicker(), function (views: Array<viewModule.View>) {
+        var timePicker = <timePickerModule.TimePicker>views[0];
+        timePickerTestsNative.setNativeTime(timePicker, expectedHour, expectedMinute);
+        assertTime(timePicker, expectedHour, expectedMinute);
+    });
+}
+
+export function testSetHourMinute_BeforeLoaded() {
+    var expectedHour = 12;
+    var expectedMinute = 34;
+
+    helper.buildUIAndRunTest(_createTimePicker(expectedHour, expectedMinute), function (views: Array<viewModule.View>) {
+        var timePicker = <timePickerModule.TimePicker>views[0];
+        assertTime(timePicker, expectedHour, expectedMinute);
+    });
+}
+
+export function testSetHourMinute_AfterLoaded() {
+    var expectedHour = 12;
+    var expectedMinute = 34;
+
+    helper.buildUIAndRunTest(_createTimePicker(), function (views: Array<viewModule.View>) {
+        var timePicker = <timePickerModule.TimePicker>views[0];
+        timePicker.hour = expectedHour;
+        timePicker.minute = expectedMinute;
+
+        assertTime(timePicker, expectedHour, expectedMinute);
+    });
+}
+
+function assertTime(timePicker: timePickerModule.TimePicker, expectedHour: number, expectedMinute) {
+    TKUnit.assertEqual(timePicker.hour, expectedHour, "timePicker.hour");
+    TKUnit.assertEqual(timePicker.minute, expectedMinute, "timePicker.minute");
+
+    TKUnit.assertEqual(timePickerTestsNative.getNativeHour(timePicker), expectedHour, "Native timePicker.hour");
+    TKUnit.assertEqual(timePickerTestsNative.getNativeMinute(timePicker), expectedMinute, "Native timePicker.minute");
 }
\ No newline at end of file
diff --git a/ui/date-picker/date-picker.android.ts b/ui/date-picker/date-picker.android.ts
index 717837639..ea676e017 100644
--- a/ui/date-picker/date-picker.android.ts
+++ b/ui/date-picker/date-picker.android.ts
@@ -1,12 +1,13 @@
 import common = require("ui/date-picker/date-picker-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
+import types = require("utils/types");
 
 function onYearPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var picker = <DatePicker>data.object;
 
     if (picker.android && picker.android.getYear() !== data.newValue) {
-        picker.android.updateDate(data.newValue, picker.android.getMonth(), picker.android.getDayOfMonth());
+        updateNativeDate(picker);
     }
 }
 
@@ -16,7 +17,7 @@ function onMonthPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var picker = <DatePicker>data.object;
 
     if (picker.android && picker.android.getMonth() !== (data.newValue - 1)) {
-        picker.android.updateDate(picker.android.getYear(), data.newValue - 1, picker.android.getDayOfMonth());
+        updateNativeDate(picker);
     }
 }
 
@@ -26,12 +27,20 @@ function onDayPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var picker = <DatePicker>data.object;
 
     if (picker.android && picker.android.getDayOfMonth !== data.newValue) {
-        picker.android.updateDate(picker.android.getYear(), picker.android.getMonth(), data.newValue);
+        updateNativeDate(picker);
     }
 }
 
 (<proxy.PropertyMetadata>common.DatePicker.dayProperty.metadata).onSetNativeValue = onDayPropertyChanged;
 
+function updateNativeDate(picker: DatePicker) {
+    var year = types.isNumber(picker.year) ? picker.year : picker.android.getYear();
+    var month = types.isNumber(picker.month) ? (picker.month - 1) : picker.android.getMonth();
+    var day = types.isNumber(picker.day) ? picker.day : picker.android.getDayOfMonth();
+
+    picker.android.updateDate(year, month, day);
+}
+
 function onMaxDatePropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var picker = <DatePicker>data.object;
 
@@ -89,7 +98,7 @@ export class DatePicker extends common.DatePicker {
 
                     if (day !== this.owner.day) {
                         this.owner._onPropertyChangedFromNative(common.DatePicker.dayProperty, day);
-                    }                    
+                    }
                 }
             }
         });
diff --git a/ui/time-picker/time-picker.android.ts b/ui/time-picker/time-picker.android.ts
index 4f642af22..f7268887d 100644
--- a/ui/time-picker/time-picker.android.ts
+++ b/ui/time-picker/time-picker.android.ts
@@ -4,20 +4,14 @@ import proxy = require("ui/core/proxy");
 
 function onHourPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var picker = <TimePicker>data.object;
-
-    if (picker.android) {
-        picker.android.setCurrentHour(new java.lang.Integer(data.newValue));
-    }
+    picker._setNativeHourSilently(data.newValue);
 }
 
 (<proxy.PropertyMetadata>common.TimePicker.hourProperty.metadata).onSetNativeValue = onHourPropertyChanged;
 
 function onMinutePropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var picker = <TimePicker>data.object;
-
-    if (picker.android) {
-        picker.android.setCurrentMinute(new java.lang.Integer(data.newValue));
-    }
+    picker._setNativeMinuteSilently(data.newValue);
 }
 
 (<proxy.PropertyMetadata>common.TimePicker.minuteProperty.metadata).onSetNativeValue = onMinutePropertyChanged;
@@ -29,6 +23,7 @@ require("utils/module-merge").merge(common, exports);
 export class TimePicker extends common.TimePicker {
     private _android: android.widget.TimePicker;
     private _listener: android.widget.TimePicker.OnTimeChangedListener;
+    private _isSettingTime: boolean = false;
 
     get android(): android.widget.TimePicker {
         return this._android;
@@ -45,12 +40,12 @@ export class TimePicker extends common.TimePicker {
             },
 
             onTimeChanged: function (picker: android.widget.TimePicker, hour: number, minute: number) {
-                if (this.owner) {
-                    
+                if (this.owner && !this.owner._isSettingTime) {
+
                     if (hour !== this.owner.hour) {
                         this.owner._onPropertyChangedFromNative(common.TimePicker.hourProperty, hour);
                     }
-                    
+
                     if (minute !== this.owner.minute) {
                         this.owner._onPropertyChangedFromNative(common.TimePicker.minuteProperty, minute);
                     }
@@ -59,4 +54,32 @@ export class TimePicker extends common.TimePicker {
         });
         this._android.setOnTimeChangedListener(this._listener);
     }
+
+    public _setNativeHourSilently(newValue: number) {
+        if (!this.android) {
+            return;
+        }
+
+        this._isSettingTime = true;
+        try {
+            this.android.setCurrentHour(new java.lang.Integer(newValue));
+        }
+        finally {
+            this._isSettingTime = false;
+        }
+    }
+
+    public _setNativeMinuteSilently(newValue: number) {
+        if (!this.android) {
+            return;
+        }
+
+        this._isSettingTime = true;
+        try {
+            this.android.setCurrentMinute(new java.lang.Integer(newValue));
+        }
+        finally {
+            this._isSettingTime = false;
+        }
+    }
 } 
\ No newline at end of file

From 30873697e94f1bb7a584931ac6b34e8da3e742ba Mon Sep 17 00:00:00 2001
From: vakrilov <alexander.vakrilov@telerik.com>
Date: Mon, 20 Apr 2015 15:58:23 +0300
Subject: [PATCH 5/6] Ts lint fix

---
 ui/border/border.android.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ui/border/border.android.ts b/ui/border/border.android.ts
index 557493399..577b559ea 100644
--- a/ui/border/border.android.ts
+++ b/ui/border/border.android.ts
@@ -1,8 +1,6 @@
 import borderCommon = require("ui/border/border-common");
 import proxy = require("ui/core/proxy");
-import view = require("ui/core/view");
 import dependencyObservable = require("ui/core/dependency-observable");
-import color = require("color");
 import utils = require("utils/utils");
 
 // merge the exports of the common file with the exports of this file

From 1851d76669331f507494304ed79c86d824b837c5 Mon Sep 17 00:00:00 2001
From: vakrilov <alexander.vakrilov@telerik.com>
Date: Mon, 20 Apr 2015 16:13:16 +0300
Subject: [PATCH 6/6] Improved SegmentedBar example

---
 apps/gallery-app/views/segmented-bar.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gallery-app/views/segmented-bar.xml b/apps/gallery-app/views/segmented-bar.xml
index 400d623f3..078fdaadd 100644
--- a/apps/gallery-app/views/segmented-bar.xml
+++ b/apps/gallery-app/views/segmented-bar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Page>
-  <SegmentedBar style="vertical-align: center; margin: 20; background-color: lightblue;">
+  <SegmentedBar style="vertical-align: center; margin: 20;">
     <SegmentedBar.items>
       <SegmentedBarItem title="Item 1" />
       <SegmentedBarItem title="Item 2" />