Merge pull request NativeScript#3334 from NativeScript/reexports

hamorphis · web-flow · commit adf21e184bd6 · 2016-12-20T16:16:11.000+02:00
Fixed Android _onAttached logic. Fixes setting props in code-behind.
diff --git a/apps/.vscode/launch.json b/apps/.vscode/launch.json
@@ -11,7 +11,8 @@
             "diagnosticLogging": false,
             "emulator": false,
             "rebuild": false,
-            "syncAllFiles": true
+            "syncAllFiles": true,
+            "stopOnEntry": true
         },
         {
             "name": "Launch on iOS",
@@ -22,7 +23,8 @@
             "sourceMaps": true,
             "diagnosticLogging": false,
             "emulator": false,
-            "rebuild": true
+            "rebuild": true,
+            "stopOnEntry": true
         },
         {
             "name": "Attach on iOS",
@@ -32,7 +34,8 @@
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
-            "emulator": false
+            "emulator": false,
+            "stopOnEntry": true
         },
         {
             "name": "Sync on Android",
@@ -44,7 +47,8 @@
             "diagnosticLogging": false,
             "emulator": false,
             "rebuild": false,
-            "syncAllFiles": true
+            "syncAllFiles": true,
+            "stopOnEntry": true
         },
         {
             "name": "Launch on Android",
@@ -55,7 +59,8 @@
             "sourceMaps": true,
             "diagnosticLogging": false,
             "emulator": false,
-            "rebuild": true
+            "rebuild": true,
+            "stopOnEntry": true
         },
         {
             "name": "Attach on Android",
@@ -65,7 +70,8 @@
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
-            "emulator": false
+            "emulator": false,
+            "stopOnEntry": true
         }
     ]
 }
diff --git a/apps/app/ui-tests-app/app.ts b/apps/app/ui-tests-app/app.ts
@@ -4,7 +4,6 @@ trace.enable();
 trace.setCategories(trace.categories.concat(
     trace.categories.NativeLifecycle,
     trace.categories.Navigation,
-    //trace.categories.Animation,
     trace.categories.Transition
     ));
 
@@ -69,7 +68,7 @@ application.on(application.lowMemoryEvent, function (args: application.Applicati
     }
 });
 
-application.on(application.uncaughtErrorEvent, function (args: application.ApplicationEventData) {
+application.on(application.uncaughtErrorEvent, function (args: application.UnhandledErrorEventData) {
     if (args.android) {
         // For Android applications, args.android is NativeScriptError.
         console.log("### NativeScriptError: " + args.android);
diff --git a/tns-core-modules/ui/core/view.android.ts b/tns-core-modules/ui/core/view.android.ts
@@ -160,14 +160,12 @@ export class View extends ViewCommon {
                 }
 
                 // copy all the locally cached values to the native android widget
-                applyNativeSetters(child);
                 return true;
             }
             this._eachChildView(eachChild);
-        } else if (this._nativeView && !this.parent) {
-            // copy all the locally cached values to the native android widget
-            applyNativeSetters(this);
-        }
+        } 
+
+        applyNativeSetters(this);
     }
 
     public _onDetached(force?: boolean) {
diff --git a/tns-core-modules/ui/styling/background.android.ts b/tns-core-modules/ui/styling/background.android.ts
@@ -58,7 +58,7 @@ export module ad {
                     _defaultBackgrounds.set(viewClass, nativeView.getBackground());
                 }
                 
-                backgroundDrawable = new org.nativescript.widgets.BorderDrawable(v.toString());
+                backgroundDrawable = new org.nativescript.widgets.BorderDrawable(1, v.toString());
                 refreshBorderDrawable(v, <org.nativescript.widgets.BorderDrawable>backgroundDrawable);
 
                 if (getSDK() >= 16) {
diff --git a/tns-platform-declarations/android/org.nativescript.widgets.d.ts b/tns-platform-declarations/android/org.nativescript.widgets.d.ts
@@ -46,7 +46,8 @@
             }
 
             export class BorderDrawable extends android.graphics.drawable.ColorDrawable {
-                constructor(id: string);
+                constructor(density: number);
+                constructor(density: number, id: string);
 
                 public refresh(
                     borderTopColor: number,

Original file line number	Diff line number	Diff line change
`@@ -160,14 +160,12 @@ export class View extends ViewCommon {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`// copy all the locally cached values to the native android widget`
`163`		`- applyNativeSetters(child);`
`164`	`163`	`return true;`
`165`	`164`	`}`
`166`	`165`	`this._eachChildView(eachChild);`
`167`		`- } else if (this._nativeView && !this.parent) {`
`168`		`- // copy all the locally cached values to the native android widget`
`169`		`- applyNativeSetters(this);`
`170`		`- }`
	`166`	`+ }`
	`167`	`+`
	`168`	`+ applyNativeSetters(this);`
`171`	`169`	`}`
`172`	`170`
`173`	`171`	`public _onDetached(force?: boolean) {`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ export module ad {`
`58`	`58`	`_defaultBackgrounds.set(viewClass, nativeView.getBackground());`
`59`	`59`	`}`
`60`	`60`
`61`		`- backgroundDrawable = new org.nativescript.widgets.BorderDrawable(v.toString());`
	`61`	`+ backgroundDrawable = new org.nativescript.widgets.BorderDrawable(1, v.toString());`
`62`	`62`	`refreshBorderDrawable(v, <org.nativescript.widgets.BorderDrawable>backgroundDrawable);`
`63`	`63`
`64`	`64`	`if (getSDK() >= 16) {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`export class BorderDrawable extends android.graphics.drawable.ColorDrawable {`
`49`		`- constructor(id: string);`
	`49`	`+ constructor(density: number);`
	`50`	`+ constructor(density: number, id: string);`
`50`	`51`
`51`	`52`	`public refresh(`
`52`	`53`	`borderTopColor: number,`