From bba7a82bdfceb77c306b6dd699f494df68e334e0 Mon Sep 17 00:00:00 2001
From: Hristo Hristov <hristo.hristov@telerik.com>
Date: Thu, 17 Aug 2017 09:15:35 +0300
Subject: [PATCH] Disable recycling, refactoring & fixes (#4705)

* Added tests for native view recycling
Disabled android native view recycling
Move toString from view-common to view-base
Fix crash on application restore and navigation back on API26
Added setAsRootView method
Added missing logo into perf-tests/recycling app

* additional fix for image-source-tests. ios is case sensitive.

* Add @private to some internal properties
Fix where padding is not respected when background is reset.
---
 apps/app/logo.png                             | Bin 0 -> 4918 bytes
 apps/app/perf-app/recycling/main-page.ts      |  49 +++-
 apps/app/perf-app/recycling/main-page.xml     |  12 +-
 apps/app/perf-app/recycling/tests.ts          | 225 +++++++++++++-----
 .../app/image-source/image-source-snippet.ts  |   2 +-
 tests/app/image-source/image-source-tests.ts  |   8 +-
 tests/app/ui/helper.ts                        |  92 +++----
 tests/app/ui/view/view-tests-common.ts        |   8 +-
 tests/app/ui/view/view-tests.android.ts       | 125 ++++++++--
 .../application/application.ios.ts            |   1 +
 .../ui/core/view-base/view-base.d.ts          |  16 +-
 .../ui/core/view-base/view-base.ts            | 162 +++++++------
 tns-core-modules/ui/core/view/view-common.ts  |  18 --
 tns-core-modules/ui/core/view/view.android.ts |  16 +-
 tns-core-modules/ui/frame/frame-common.ts     |  16 ++
 tns-core-modules/ui/frame/frame.android.ts    |  10 +-
 tns-core-modules/ui/frame/frame.d.ts          |   4 +
 tns-core-modules/ui/frame/frame.ios.ts        |  19 +-
 18 files changed, 532 insertions(+), 251 deletions(-)
 create mode 100644 apps/app/logo.png

diff --git a/apps/app/logo.png b/apps/app/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..add1ce15d7477b400746e55468e587caa12c17f1
GIT binary patch
literal 4918
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

literal 0
HcmV?d00001

diff --git a/apps/app/perf-app/recycling/main-page.ts b/apps/app/perf-app/recycling/main-page.ts
index 2c95470c2..da0e75ffd 100644
--- a/apps/app/perf-app/recycling/main-page.ts
+++ b/apps/app/perf-app/recycling/main-page.ts
@@ -1,6 +1,8 @@
 import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
 import { TextView } from "tns-core-modules/ui/text-view";
 import { Button } from "tns-core-modules/ui/button";
+import * as platform from "tns-core-modules/platform";
+import * as application from "tns-core-modules/application";
 
 import * as tests from "./tests";
 
@@ -13,6 +15,28 @@ function getStack(stack: StackLayout): StackLayout {
     return p;
 }
 
+export function navigatingTo(args) {
+    // Request permission to write test-results.xml file for API >= 23
+    if (platform.isAndroid && parseInt(platform.device.sdkVersion) >= 23) {
+        let handler = (args: application.AndroidActivityRequestPermissionsEventData) => {
+            application.android.off(application.AndroidApplication.activityRequestPermissionsEvent, handler);
+            if (args.requestCode === 1234 && args.grantResults.length > 0 && args.grantResults[0] === android.content.pm.PackageManager.PERMISSION_GRANTED) {
+                console.log("Permission for write to external storage GRANTED!")
+            } else {
+                console.log("Permission for write to external storage not granted!");
+            }
+        };
+
+        application.android.on(application.AndroidApplication.activityRequestPermissionsEvent, handler);
+
+        if ((<any>android.support.v4.content.ContextCompat).checkSelfPermission(application.android.currentContext, (<any>android).Manifest.permission.WRITE_EXTERNAL_STORAGE) !== android.content.pm.PackageManager.PERMISSION_GRANTED) {
+            (<any>android.support.v4.app.ActivityCompat).requestPermissions(application.android.currentContext, [(<any>android).Manifest.permission.WRITE_EXTERNAL_STORAGE], 1234);
+        }
+    } else {
+        console.log("Permission for write to external storage GRANTED!")
+    }
+}
+
 export function onNavigatingFrom() {
     clearInterval(runner);
 }
@@ -39,7 +63,30 @@ export function onTap(args) {
     track(text);
 
     let tasks = [
-        () => track(tests.testAll(p)),
+        () => track(tests.testSetup(p)),
+        () => track(tests.testFlexboxLayout(p)),
+        () => track(tests.testDockLayout(p)),
+        () => track(tests.testGridLayout(p)),
+        () => track(tests.testStackLayout(p)),
+        () => track(tests.testWrapLayout(p)),
+        () => track(tests.testAbsoluteLayout(p)),
+        () => track(tests.testButton(p)),
+        () => track(tests.testActionBar(p)),
+        () => track(tests.testActivityIndicator(p)),
+        () => track(tests.testBorder(p)),
+        () => track(tests.testContentView(p)),
+        () => track(tests.testDatePicker(p)),
+        () => track(tests.testHtmlView(p)),
+        () => track(tests.testImage(p)),
+        () => track(tests.testLabel(p)),
+        () => track(tests.testListPicker(p)),
+        () => track(tests.testListView(p)),
+        () => track(tests.testPage(p)),
+        () => track(tests.testProgress(p)),
+        () => track(tests.testRepeater(p)),
+        () => track(tests.testSwitch(p)),
+        () => track(tests.testTextField(p)),
+        () => track(tests.testTextView(p)),
         () => track("Complete!")
     ];
     let i = 0;
diff --git a/apps/app/perf-app/recycling/main-page.xml b/apps/app/perf-app/recycling/main-page.xml
index e85e30f9f..dfa68d243 100644
--- a/apps/app/perf-app/recycling/main-page.xml
+++ b/apps/app/perf-app/recycling/main-page.xml
@@ -1,7 +1,9 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingFrom="onNavigatingFrom">
-    <GridLayout rows="30,100,*">
-        <Button text="Start test..." tap="onTap" style="font-size:8" />
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" 
+    navigatingFrom="onNavigatingFrom"
+    navigatingTo="navigatingTo">
+    <StackLayout>
+        <Button text="Start test..." tap="onTap" style="font-size:11" />
         <StackLayout id="placeholder" row="1"/>
-        <TextView id="result" row="2" />
-    </GridLayout>
+        <TextView id="result" row="2" editable="false" />
+    </StackLayout>
 </Page>
\ No newline at end of file
diff --git a/apps/app/perf-app/recycling/tests.ts b/apps/app/perf-app/recycling/tests.ts
index c30fa4e9a..9b2cb697c 100644
--- a/apps/app/perf-app/recycling/tests.ts
+++ b/apps/app/perf-app/recycling/tests.ts
@@ -26,57 +26,122 @@ import { TextField } from 'tns-core-modules/ui/text-field';
 import { TextView } from 'tns-core-modules/ui/text-view';
 import { TimePicker } from 'tns-core-modules/ui/time-picker';
 import { View } from 'tns-core-modules/ui/core/view';
-import { FormattedString, Span } from "tns-core-modules/text/formatted-string";
+import { FormattedString, Span } from 'tns-core-modules/text/formatted-string';
+import { _getProperties, _getStyleProperties } from 'tns-core-modules/ui/core/properties';
+declare var __startCPUProfiler;
+declare var __stopCPUProfiler;
 
-export function testAll(layout: StackLayout): string {
+const count = 200;
+export function testSetup(layout: StackLayout): string {
     setupSetters();
-    const count = 100;
-    let result = '';
-    // result += test(layout, () => new FlexboxLayout(), count);    
-    // result += test(layout, () => new ActionBar(), count);
-    // result += test(layout, () => new ActivityIndicator(), count);
-    // result += test(layout, () => new Border(), count);
-    result += test(layout, () => new Button(), count);
-    // result += test(layout, () => new ContentView(), count);
-    // result += test(layout, () => new DatePicker(), count);
-    // result += test(layout, () => new HtmlView(), count);
-    // result += test(layout, () => new Image(), count);
-    // result += test(layout, () => new Label(), count);
-    // result += test(layout, () => new AbsoluteLayout(), count);
-    // result += test(layout, () => new DockLayout(), count);
-    // result += test(layout, () => new GridLayout(), count);
-    // result += test(layout, () => new StackLayout(), count);
-    // result += test(layout, () => new WrapLayout(), count);
-    // result += test(layout, () => new ListPicker(), count);
-    // result += test(layout, () => new ListView(), count);
-    // result += test(layout, () => new Page(), count);
-    // result += test(layout, () => new Progress(), count);
-    // result += test(layout, () => new Repeater(), count);
-    // result += test(layout, () => new Switch(), count);
-    // result += test(layout, () => new TextField(), count);
-    // result += test(layout, () => new TextView(), count);
-    
-    // Throws
-    // result += test(layout, () => new TabView(), count);
-    // result += test(layout, () => new SegmentedBar(), count);
-    // result += test(layout, () => new TimePicker(), count);
+    return '';
+}
 
-    return result;
+export function testFlexboxLayout(layout: StackLayout): string {
+    return test(layout, () => new FlexboxLayout(), count);
+}
+
+export function testDockLayout(layout: StackLayout): string {
+    return test(layout, () => new DockLayout(), count);
+}
+
+export function testGridLayout(layout: StackLayout): string {
+    return test(layout, () => new GridLayout(), count);
+}
+
+export function testStackLayout(layout: StackLayout): string {
+    return test(layout, () => new StackLayout(), count);
+}
+
+export function testWrapLayout(layout: StackLayout): string {
+    return test(layout, () => new WrapLayout(), count);
+}
+
+export function testAbsoluteLayout(layout: StackLayout): string {
+    return test(layout, () => new AbsoluteLayout(), count);
+}
+
+export function testButton(layout: StackLayout): string {
+    return test(layout, () => new Button(), count);
+}
+
+export function testActionBar(layout: StackLayout): string {
+    return test(layout, () => new ActionBar(), count);
+}
+
+export function testActivityIndicator(layout: StackLayout): string {
+    return test(layout, () => new ActivityIndicator(), count);
+}
+
+export function testBorder(layout: StackLayout): string {
+    return test(layout, () => new Border(), count);
+}
+
+export function testContentView(layout: StackLayout): string {
+    return test(layout, () => new ContentView(), count);
+}
+
+export function testDatePicker(layout: StackLayout): string {
+    return test(layout, () => new DatePicker(), count);
+}
+
+export function testHtmlView(layout: StackLayout): string {
+    return test(layout, () => new HtmlView(), count);
+}
+
+export function testImage(layout: StackLayout): string {
+    return test(layout, () => new Image(), count);
+}
+
+export function testLabel(layout: StackLayout): string {
+    return test(layout, () => new Label(), count);
+}
+
+export function testListPicker(layout: StackLayout): string {
+    return test(layout, () => new ListPicker(), count);
+}
+
+export function testListView(layout: StackLayout): string {
+    return test(layout, () => new ListView(), count);
+}
+
+export function testPage(layout: StackLayout): string {
+    return test(layout, () => new Page(), count);
+}
+
+export function testProgress(layout: StackLayout): string {
+    return test(layout, () => new Progress(), count);
+}
+
+export function testRepeater(layout: StackLayout): string {
+    return test(layout, () => new Repeater(), count);
+}
+
+export function testSwitch(layout: StackLayout): string {
+    return test(layout, () => new Switch(), count);
+}
+
+export function testTextField(layout: StackLayout): string {
+    return test(layout, () => new TextField(), count);
+}
+
+export function testTextView(layout: StackLayout): string {
+    return test(layout, () => new TextView(), count);
 }
 
 function test(layout: StackLayout, createView: () => View, count: number): string {
     const viewMap1 = new Map<string, any>();
     const cssMap1 = new Map<string, any>();
-    
+
     viewMap1.set('isEnabled', false);
-    let result = execute(layout, createView, count, viewMap1, cssMap1) + ', ';
+    let result = execute(layout, createView, count, viewMap1, cssMap1)
 
     viewMap1.set('text', 'text');
     viewMap1.set('automationText', "automationText");
     cssMap1.set('width', 100);
     cssMap1.set('height', 100);
     cssMap1.set('rotate', '90');
-    result += execute(layout, createView, count, viewMap1, cssMap1) + ', ';
+    result += execute(layout, createView, count, viewMap1, cssMap1)
 
     viewMap1.set('clipToBounds', false);
     viewMap1.set('left', '20');
@@ -91,7 +156,7 @@ function test(layout: StackLayout, createView: () => View, count: number): strin
     cssMap1.set('horizontalAlignment', 'center');
     cssMap1.set('verticalAlignment', 'center');
 
-    result += execute(layout, createView, count, viewMap1, cssMap1) + ', ';
+    result += execute(layout, createView, count, viewMap1, cssMap1)
 
     viewMap1.set('row', '1');
     viewMap1.set('rowSpan', '2');
@@ -110,45 +175,79 @@ function test(layout: StackLayout, createView: () => View, count: number): strin
     cssMap1.set('backgroundColor', 'red');
     cssMap1.set('backgroundImage', '~/logo.png');
 
-    result += execute(layout, createView, count, viewMap1, cssMap1) + ', ';
+    result += execute(layout, createView, count, viewMap1, cssMap1)
     result += execute(layout, createView, count, setters, cssSetters);
 
-    return `${createView().typeName}: ${result}\n`;
+    return `${createView().typeName}: ${result}`;
 }
 
+let b = false;
 function execute(layout: StackLayout, createView: () => View, count: number,
     viewProps: Map<string, any>, cssProps: Map<string, any>): string {
-    const not = profile(layout, createView, count, false, viewProps, cssProps);
-    const recycled = profile(layout, createView, count, true, viewProps, cssProps);
 
-    const improved = ((not - recycled) / not) * 100;
-    console.log(`recycled time: ${recycled}`);
-    console.log(`not recycled time: ${not}`);
-    const propCount = viewProps.size + cssProps.size;
-    return `${propCount}: ${improved.toFixed(0)}%`;
+    gc();
+    java.lang.System.gc();
+    gc();
+    java.lang.System.gc();
+    // b = !b;
+    // let not: { time: number, count: number };
+    let recycled: { time: number, count: number };
+    // if (b) {
+    //     not = profile(layout, createView, count, false, viewProps, cssProps);
+    //     recycled = profile(layout, createView, count, true, viewProps, cssProps);
+    // } else {
+    recycled = profile(layout, createView, count, true, viewProps, cssProps);
+    // not = profile(layout, createView, count, false, viewProps, cssProps);
+    // }
+
+    // console.log(`recycled: ${recycled.time}`);
+    // console.log(`not: ${not.time}`);
+    // const improved = ((not.time - recycled.time) / not.time) * 100;
+    const propCount = recycled.count;
+    return `\t${recycled.time.toFixed(0)}`;
 }
 
+const props = _getProperties();
+const styleProps = _getStyleProperties();
+
 function profile(layout: StackLayout, createView: () => View, count: number, recycle: boolean,
-    viewProps: Map<string, any>, cssProps: Map<string, any>): number {
+    viewProps: Map<string, any>, cssProps: Map<string, any>): { time: number, count: number } {
 
     const view = createView();
     view.recycleNativeView = recycle ? 'always' : 'never';
     const style = view.style;
+    // DatePicker throws OOM
+    const c = view.typeName === 'DatePicker' ? 1 : 5;
+    let total = 0;
+    let x = 0;
+    for (let i = 0; i < c; i++) {
+        x = 0;
+        viewProps.forEach((v, k) => {
+            const p = props.find(vp => (<any>vp).name === k);
+            // if (p && view[p.setNative]) {
+            view[k] = v;
+            x++;
+            // }
+        });
 
-    viewProps.forEach((v, k) => view[k] = v);
-    cssProps.forEach((v, k) => style[k] = v);
+        cssProps.forEach((v, k) => {
+            const p = styleProps.find(vp => (<any>vp).name === k);
+            // if (p && view[p.setNative]) {
+            style[k] = v;
+            x++;
+            // }
+        });
 
-    gc();
-    java.lang.System.gc();
-    const start = time();
-
-    for (let i = 0; i < count; i++) {
-        layout.addChild(view);
-        layout.removeChild(view);
+        const start = time();
+        for (let i = 0; i < count; i++) {
+            layout.addChild(view);
+            layout.removeChild(view);
+        }
+        const end = time() - start;
+        total += end;
     }
 
-    const end = time() - start;
-    return end;
+    return { time: total / c, count: x };
 }
 
 let setters: Map<string, any>;
@@ -282,11 +381,11 @@ function setupSetters(): void {
     setters.set('androidOffscreenTabLimit', '2');
 
     // text-base
-    const formattedText = new FormattedString();
-    const span = new Span();
-    span.text = 'span';
-    formattedText.spans.push(span);
-    setters.set('formattedText', formattedText);
+    // const formattedText = new FormattedString();
+    // const span = new Span();
+    // span.text = 'span';
+    // formattedText.spans.push(span);
+    // setters.set('formattedText', formattedText);
 
     // text-base
     setters.set('secure', 'true');
diff --git a/tests/app/image-source/image-source-snippet.ts b/tests/app/image-source/image-source-snippet.ts
index 879c237be..69164f189 100644
--- a/tests/app/image-source/image-source-snippet.ts
+++ b/tests/app/image-source/image-source-snippet.ts
@@ -6,7 +6,7 @@ export function imageSourceFromAsset(imageAsset){
     let source = new imageSource.ImageSource();
      source.fromAsset(imageAsset).then((source) => {
          let folder = fs.knownFolders.documents().path;
-         let fileName = "Test.png"
+         let fileName = "test.png"
          let path = fs.path.join(folder, fileName);
          let saved = source.saveToFile(path, "png");
          if(saved){
diff --git a/tests/app/image-source/image-source-tests.ts b/tests/app/image-source/image-source-tests.ts
index b2b41370c..e003d336d 100644
--- a/tests/app/image-source/image-source-tests.ts
+++ b/tests/app/image-source/image-source-tests.ts
@@ -56,7 +56,7 @@ export function testSaveToFile() {
     // >> imagesource-save-to
     var img = imageSource.fromFile(imagePath);
     var folder = fs.knownFolders.documents();
-    var path = fs.path.join(folder.path, "Test.png");
+    var path = fs.path.join(folder.path, "test.png");
     var saved = img.saveToFile(path, "png");
     // << imagesource-save-to
     TKUnit.assert(saved, "Image not saved to file");
@@ -66,16 +66,16 @@ export function testSaveToFile() {
 export function testFromFile() {
     // >> imagesource-load-local
     var folder = fs.knownFolders.documents();
-    var path = fs.path.join(folder.path, "Test.png");
+    var path = fs.path.join(folder.path, "test.png");
     var img = imageSource.fromFile(path);
     // << imagesource-load-local
 
     TKUnit.assert(img.height > 0, "image.fromResource failed");
 
     // remove the image from the file system
-    var file = folder.getFile("Test.png");
+    var file = folder.getFile("test.png");
     file.remove();
-    TKUnit.assert(!fs.File.exists(path), "Test.png not removed");
+    TKUnit.assert(!fs.File.exists(path), "test.png not removed");
 }
 
 export function testNativeFields() {
diff --git a/tests/app/ui/helper.ts b/tests/app/ui/helper.ts
index 36ff92310..3446a96da 100644
--- a/tests/app/ui/helper.ts
+++ b/tests/app/ui/helper.ts
@@ -248,63 +248,65 @@ let cssSetters: Map<string, any>;
 let defaultNativeGetters: Map<string, (view) => any>;
 
 export function nativeView_recycling_test(createNew: () => View, createLayout?: () => LayoutBase, nativeGetters?: Map<string, (view) => any>, customSetters?: Map<string, any>) {
-    if (isIOS) {
-        // recycling not implemented yet.
-        return;
-    }
+    return;
 
-    setupSetters();
-    const page = getClearCurrentPage();
-    let layout: LayoutBase = new FlexboxLayout();
-    if (createLayout) {
-        // This is done on purpose. We need the constructor of Flexbox
-        // to run otherwise some module fileds stays uninitialized.
-        layout = createLayout();
-    }
+    // if (isIOS) {
+    //     // recycling not implemented yet.
+    //     return;
+    // }
 
-    page.content = layout;
+    // setupSetters();
+    // const page = getClearCurrentPage();
+    // let layout: LayoutBase = new FlexboxLayout();
+    // if (createLayout) {
+    //     // This is done on purpose. We need the constructor of Flexbox
+    //     // to run otherwise some module fileds stays uninitialized.
+    //     layout = createLayout();
+    // }
 
-    const first = createNew();
-    const test = createNew();
+    // page.content = layout;
 
-    // Make sure we are not reusing a native views.
-    first.recycleNativeView = "never";
-    test.recycleNativeView = "never";
+    // const first = createNew();
+    // const test = createNew();
 
-    page.content = layout;
+    // // Make sure we are not reusing a native views.
+    // first.recycleNativeView = "never";
+    // test.recycleNativeView = "never";
 
-    layout.addChild(test);
+    // page.content = layout;
 
-    setValue(test.style, cssSetters);
-    setValue(test, setters, customSetters);
-    // Needed so we can reset formattedText
-    test["secure"] = false;
+    // layout.addChild(test);
 
-    const nativeView = test.nativeViewProtected;
-    // Mark so we reuse the native views.
-    test.recycleNativeView = "always";
-    layout.removeChild(test);
-    const newer = createNew();
-    newer.recycleNativeView = "always";
-    layout.addChild(newer);
-    layout.addChild(first);
+    // setValue(test.style, cssSetters);
+    // setValue(test, setters, customSetters);
+    // // Needed so we can reset formattedText
+    // test["secure"] = false;
 
-    if (first.typeName !== "SearchBar") {
-        // There are way too many differences in native methods for search-bar.
-        // There are too many methods that just throw for newly created views in API lvl 19 and 17
-        if (sdkVersion < 21) {
-            TKUnit.waitUntilReady(() => layout.isLayoutValid);
-        }
+    // const nativeView = test.nativeViewProtected;
+    // // Mark so we reuse the native views.
+    // test.recycleNativeView = "always";
+    // layout.removeChild(test);
+    // const newer = createNew();
+    // newer.recycleNativeView = "always";
+    // layout.addChild(newer);
+    // layout.addChild(first);
 
-        compareUsingReflection(newer, first);
-    }
+    // if (first.typeName !== "SearchBar") {
+    //     // There are way too many differences in native methods for search-bar.
+    //     // There are too many methods that just throw for newly created views in API lvl 19 and 17
+    //     if (sdkVersion < 21) {
+    //         TKUnit.waitUntilReady(() => layout.isLayoutValid);
+    //     }
 
-    TKUnit.assertEqual(newer.nativeViewProtected, nativeView, "nativeView not reused.");
-    checkDefaults(newer, first, props, nativeGetters || defaultNativeGetters);
-    checkDefaults(newer, first, styleProps, nativeGetters || defaultNativeGetters);
+    //     compareUsingReflection(newer, first);
+    // }
 
-    layout.removeChild(newer);
-    layout.removeChild(first);
+    // TKUnit.assertEqual(newer.nativeViewProtected, nativeView, "nativeView not reused.");
+    // checkDefaults(newer, first, props, nativeGetters || defaultNativeGetters);
+    // checkDefaults(newer, first, styleProps, nativeGetters || defaultNativeGetters);
+
+    // layout.removeChild(newer);
+    // layout.removeChild(first);
 }
 
 function compareUsingReflection(recycledNativeView: View, newNativeView: View): void {
diff --git a/tests/app/ui/view/view-tests-common.ts b/tests/app/ui/view/view-tests-common.ts
index 703bc7f76..759b3c38c 100644
--- a/tests/app/ui/view/view-tests-common.ts
+++ b/tests/app/ui/view/view-tests-common.ts
@@ -601,8 +601,12 @@ export function test_NativeSetter_called_when_add_and_remove_and_recycled() {
         firstView.removeChild(secondView);
 
         // we don't recycle nativeViews on iOS yet so reset is not called.
-        TKUnit.assertEqual(secondView.cssPropCounter, isIOS ? 2 : 3, "7");
-        TKUnit.assertEqual(secondView.viewPropCounter, isIOS ? 2 : 3, "8");
+        // Recycling disabled for android too
+        // TKUnit.assertEqual(secondView.cssPropCounter, isIOS ? 2 : 3, "7");
+        // TKUnit.assertEqual(secondView.viewPropCounter, isIOS ? 2 : 3, "8");
+
+        TKUnit.assertEqual(secondView.cssPropCounter, 2, "7");
+        TKUnit.assertEqual(secondView.viewPropCounter,2, "8");
     });
 };
 
diff --git a/tests/app/ui/view/view-tests.android.ts b/tests/app/ui/view/view-tests.android.ts
index 47af9c9b0..d5277bd09 100644
--- a/tests/app/ui/view/view-tests.android.ts
+++ b/tests/app/ui/view/view-tests.android.ts
@@ -2,9 +2,9 @@
 import * as commonTests from "./view-tests-common";
 import * as helper from "../../ui/helper";
 import * as view from "tns-core-modules/ui/core/view";
-import * as button from "tns-core-modules/ui/button";
+import { Button } from "tns-core-modules/ui/button";
 import * as types from "tns-core-modules/utils/types";
-import * as stack from "tns-core-modules/ui/layouts/stack-layout";
+import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
 import * as labelModule from "tns-core-modules/ui/label";
 import * as frame from "tns-core-modules/ui/frame";
 import * as trace from "tns-core-modules/trace";
@@ -14,6 +14,101 @@ trace.enable();
 
 global.moduleMerge(commonTests, exports);
 
+// function setup(): StackLayout {
+//     const page = helper.getClearCurrentPage();
+//     const stack = new StackLayout();
+//     page.content = stack;
+//     return stack;
+// }
+
+// export function test_recycle_native_view_never() {
+//     const stack = setup();
+//     const btn = new Button();
+//     btn.recycleNativeView = 'never';
+//     stack.addChild(btn);
+//     TKUnit.assertNotNull(btn.nativeViewProtected);
+
+//     const oldNativeView = btn.nativeViewProtected;
+//     stack.removeChild(btn);
+//     stack.addChild(btn);
+//     const newNativeView = btn.nativeViewProtected;
+//     TKUnit.assertNotEqual(oldNativeView, newNativeView);
+// }
+
+// export function test_recycle_native_view_always() {
+//     const stack = setup();
+//     const btn = new Button();
+//     btn.recycleNativeView = 'always';
+//     stack.addChild(btn);
+//     TKUnit.assertNotNull(btn.nativeViewProtected);
+
+//     const oldNativeView = btn.nativeViewProtected;
+//     stack.removeChild(btn);
+//     stack.addChild(btn);
+//     const newNativeView = btn.nativeViewProtected;
+//     TKUnit.assertEqual(oldNativeView, newNativeView);
+// }
+
+// export function test_recycle_native_view_auto_access_nativeView() {
+//     const stack = setup();
+//     const btn = new Button();
+//     btn.recycleNativeView = 'auto';
+//     stack.addChild(btn);
+//     TKUnit.assertNotNull(btn.nativeView);
+
+//     const oldNativeView = btn.nativeViewProtected;
+//     stack.removeChild(btn);
+//     stack.addChild(btn);
+//     const newNativeView = btn.nativeViewProtected;
+//     TKUnit.assertNotEqual(oldNativeView, newNativeView);
+// }
+
+// export function test_recycle_native_view_auto_access_android() {
+//     const stack = setup();
+//     const btn = new Button();
+//     btn.recycleNativeView = 'auto';
+//     stack.addChild(btn);
+//     TKUnit.assertNotNull(btn.android);
+
+//     const oldNativeView = btn.nativeViewProtected;
+//     stack.removeChild(btn);
+//     stack.addChild(btn);
+//     const newNativeView = btn.nativeViewProtected;
+//     TKUnit.assertNotEqual(oldNativeView, newNativeView);
+// }
+
+// export function test_recycle_property_counter_few_properties() {
+//     const stack = setup();
+//     const btn = new Button();
+//     btn.text = "text";
+//     btn.recycleNativeView = 'auto';
+//     stack.addChild(btn);
+//     TKUnit.assertNotNull(btn.nativeViewProtected);
+
+//     const oldNativeView = btn.nativeViewProtected;
+//     stack.removeChild(btn);
+//     stack.addChild(btn);
+//     const newNativeView = btn.nativeViewProtected;
+//     TKUnit.assertEqual(oldNativeView, newNativeView);
+// }
+
+// export function test_recycle_property_counter_more_properties() {
+//     const stack = setup();
+//     const btn = new Button();
+//     btn.recyclePropertyCounter = 1;
+//     btn.recycleNativeView = 'auto';
+//     btn.text = "text";
+//     btn.style.margin = "20";
+//     stack.addChild(btn);
+//     TKUnit.assertNotNull(btn.nativeViewProtected);
+
+//     const oldNativeView = btn.nativeViewProtected;
+//     stack.removeChild(btn);
+//     stack.addChild(btn);
+//     const newNativeView = btn.nativeViewProtected;
+//     TKUnit.assertNotEqual(oldNativeView, newNativeView);
+// }
+
 export const test_event_setupUI_IsRaised = function () {
     const listener = new Listener("_setupUI");
     trace.addEventListener(listener);
@@ -38,8 +133,8 @@ export const test_event_setupUI_IsRaised_WhenAttached_Dynamically = function ()
         const listener = new Listener("_setupUI");
         trace.addEventListener(listener);
 
-        const newButton = new button.Button();
-        (<stack.StackLayout>views[1]).addChild(newButton);
+        const newButton = new Button();
+        (<StackLayout>views[1]).addChild(newButton);
 
         TKUnit.assertEqual(listener.receivedEvents.length, 1);
         TKUnit.assertEqual(listener.receivedEvents[0].name, "_setupUI");
@@ -75,8 +170,8 @@ export const test_event_onContextChanged_IsRaised_WhenAttached_Dynamically = fun
         const listener = new Listener("_onContextChanged");
         trace.addEventListener(listener);
 
-        const newButton = new button.Button();
-        (<stack.StackLayout>views[1]).addChild(newButton);
+        const newButton = new Button();
+        (<StackLayout>views[1]).addChild(newButton);
 
         TKUnit.assertEqual(listener.receivedEvents.length, 1);
         TKUnit.assertEqual(listener.receivedEvents[0].name, "_onContextChanged");
@@ -125,7 +220,7 @@ export const test_event_tearDownUI_IsRaised_WhenRemoved_Dynamically = function (
         trace.addEventListener(listener);
 
         // remove the button from the layout
-        (<stack.StackLayout>views[1]).removeChild(views[2]);
+        (<StackLayout>views[1]).removeChild(views[2]);
 
         TKUnit.assertEqual(listener.receivedEvents.length, 1);
         TKUnit.assertEqual(listener.receivedEvents[0].name, "_tearDownUI");
@@ -142,8 +237,8 @@ export const test_events_tearDownUIAndRemovedFromNativeVisualTree_AreRaised_When
     let removeFromNativeVisualTreeListener = new Listener("_removeViewFromNativeVisualTree");
 
     let page = frame.topmost().currentPage;
-    let stackLayout = new stack.StackLayout();
-    let btn = new button.Button();
+    let stackLayout = new StackLayout();
+    let btn = new Button();
     stackLayout.addChild(btn);
     page.content = stackLayout;
 
@@ -174,11 +269,11 @@ export const test_events_tearDownUIAndRemovedFromNativeVisualTree_AreRaised_When
 
 export const test_cachedProperties_Applied_WhenNativeWidged_IsCreated = function () {
     const test = function (views: Array<view.View>) {
-        const newButton = new button.Button();
+        const newButton = new Button();
         newButton.text = "Test Button";
         TKUnit.assert(types.isUndefined(newButton.android));
 
-        (<stack.StackLayout>views[1]).addChild(newButton);
+        (<StackLayout>views[1]).addChild(newButton);
 
         TKUnit.assert(types.isDefined(newButton.android));
         // TODO: There is currently an issue with the getText conversion to JavaScript string
@@ -190,9 +285,9 @@ export const test_cachedProperties_Applied_WhenNativeWidged_IsCreated = function
 
 export function test_automation_text_set_to_native() {
     const test = function (views: Array<view.View>) {
-        const newButton = new button.Button();
+        const newButton = new Button();
         newButton.automationText = "Button1";
-        (<stack.StackLayout>views[1]).addChild(newButton);
+        (<StackLayout>views[1]).addChild(newButton);
         TKUnit.assertEqual((<android.widget.Button>newButton.android).getContentDescription(), "Button1", "contentDescription not set to native view.");
     };
 
@@ -234,9 +329,9 @@ class Listener implements trace.EventListener {
 export const test_StylePropertiesDefaultValuesCache = function () {
     const testValue = 35;
 
-    const test = function (views: [view.View, stack.StackLayout, button.Button, view.View]) {
+    const test = function (views: [view.View, StackLayout, Button, view.View]) {
         const testLabel = new labelModule.Label();
-        const testButton = new button.Button();
+        const testButton = new Button();
 
         const stack = views[1];
 
diff --git a/tns-core-modules/application/application.ios.ts b/tns-core-modules/application/application.ios.ts
index 74ef34e32..f02562686 100644
--- a/tns-core-modules/application/application.ios.ts
+++ b/tns-core-modules/application/application.ios.ts
@@ -215,6 +215,7 @@ function createRootView(v?: View) {
         rootView = frame;
     }
 
+    rootView._setupAsRootView({});
     return rootView;
 }
 
diff --git a/tns-core-modules/ui/core/view-base/view-base.d.ts b/tns-core-modules/ui/core/view-base/view-base.d.ts
index 2b7e84c1b..18835509f 100644
--- a/tns-core-modules/ui/core/view-base/view-base.d.ts
+++ b/tns-core-modules/ui/core/view-base/view-base.d.ts
@@ -144,11 +144,9 @@ export abstract class ViewBase extends Observable {
      * read-only. If you want to set out-of-band the nativeView use the setNativeView method.
      */
     public nativeViewProtected: any;
-    public recycleNativeView: "always" | "never" | "auto";
-
     public nativeView: any;
     public bindingContext: any;
-   
+
     /**
      * Gets the name of the constructor function for this instance. E.g. for a Button class this will return "Button".
      */
@@ -306,6 +304,14 @@ export abstract class ViewBase extends Observable {
     public ensureDomNode();
 
     //@private
+    /**
+     * @private
+     */
+    public recycleNativeView: "always" | "never" | "auto";
+    /**
+     * @private
+     */
+    public _isPaddingRelative: boolean;
     public _styleScope: any;
 
     /**
@@ -321,6 +327,10 @@ export abstract class ViewBase extends Observable {
      * Allow multiple updates to be performed on the instance at once.
      */
     public _batchUpdate<T>(callback: () => T): T;
+    /**
+     * @private
+     */
+    _setupAsRootView(context: any): void;
     //@endprivate
 }
 
diff --git a/tns-core-modules/ui/core/view-base/view-base.ts b/tns-core-modules/ui/core/view-base/view-base.ts
index d47266eb9..129b9b72d 100644
--- a/tns-core-modules/ui/core/view-base/view-base.ts
+++ b/tns-core-modules/ui/core/view-base/view-base.ts
@@ -6,6 +6,7 @@ import { Order, FlexGrow, FlexShrink, FlexWrapBefore, AlignSelf } from "../../la
 import { KeyframeAnimation } from "../../animation/keyframe-animation";
 
 // Types.
+import { Source } from "../../../utils/debug";
 import { Property, CssProperty, CssAnimationProperty, InheritedProperty, Style, clearInheritedProperties, propagateInheritableProperties, propagateInheritableCssProperties, resetCSSProperties, initNativeView, resetNativeView } from "../properties";
 import { Binding, BindingOptions, Observable, WrappedValue, PropertyChangeData, traceEnabled, traceWrite, traceCategories, traceNotifyEvent } from "../bindable";
 import { isIOS, isAndroid } from "../../../platform";
@@ -94,40 +95,40 @@ export function eachDescendant(view: ViewBaseDefinition, callback: (child: ViewB
 
 let viewIdCounter = 1;
 
-const contextMap = new WeakMap<Object, Map<string, WeakRef<Object>[]>>();
+// const contextMap = new WeakMap<Object, Map<string, WeakRef<Object>[]>>();
 
-function getNativeView(context: Object, typeName: string): Object {
-    let typeMap = contextMap.get(context);
-    if (!typeMap) {
-        typeMap = new Map<string, WeakRef<Object>[]>();
-        contextMap.set(context, typeMap);
-        return undefined;
-    }
+// function getNativeView(context: Object, typeName: string): Object {
+//     let typeMap = contextMap.get(context);
+//     if (!typeMap) {
+//         typeMap = new Map<string, WeakRef<Object>[]>();
+//         contextMap.set(context, typeMap);
+//         return undefined;
+//     }
 
-    const array = typeMap.get(typeName);
-    if (array) {
-        let nativeView;
-        while (array.length > 0) {
-            const weakRef = array.pop();
-            nativeView = weakRef.get();
-            if (nativeView) {
-                return nativeView;
-            }
-        }
-    }
-    return undefined;
-}
+//     const array = typeMap.get(typeName);
+//     if (array) {
+//         let nativeView;
+//         while (array.length > 0) {
+//             const weakRef = array.pop();
+//             nativeView = weakRef.get();
+//             if (nativeView) {
+//                 return nativeView;
+//             }
+//         }
+//     }
+//     return undefined;
+// }
 
-function putNativeView(context: Object, view: ViewBase): void {
-    const typeMap = contextMap.get(context);
-    const typeName = view.typeName;
-    let list = typeMap.get(typeName);
-    if (!list) {
-        list = [];
-        typeMap.set(typeName, list);
-    }
-    list.push(new WeakRef(view.nativeViewProtected));
-}
+// function putNativeView(context: Object, view: ViewBase): void {
+//     const typeMap = contextMap.get(context);
+//     const typeName = view.typeName;
+//     let list = typeMap.get(typeName);
+//     if (!list) {
+//         list = [];
+//         typeMap.set(typeName, list);
+//     }
+//     list.push(new WeakRef(view.nativeViewProtected));
+// }
 
 export abstract class ViewBase extends Observable implements ViewBaseDefinition {
     public static loadedEvent = "loaded";
@@ -141,7 +142,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
     private _visualState: string;
     private _inlineStyleSelector: SelectorCore;
     private __nativeView: any;
-    private _disableNativeViewRecycling: boolean;
+    // private _disableNativeViewRecycling: boolean;
     public domNode: DOMNode;
 
     public recycleNativeView: "always" | "never" | "auto";
@@ -204,7 +205,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
     public _defaultPaddingRight: number;
     public _defaultPaddingBottom: number;
     public _defaultPaddingLeft: number;
-    private _isPaddingRelative: boolean;
+    public _isPaddingRelative: boolean;
 
     constructor() {
         super();
@@ -213,7 +214,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
     }
 
     get nativeView(): any {
-        this._disableNativeViewRecycling = true;
+        // this._disableNativeViewRecycling = true;
         return this.nativeViewProtected;
     }
 
@@ -230,7 +231,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
     }
 
     get android(): any {
-        this._disableNativeViewRecycling = true;
+        // this._disableNativeViewRecycling = true;
         return this._androidView;
     }
 
@@ -670,25 +671,29 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
     }
 
     private resetNativeViewInternal(): void {
-        const nativeView = this.nativeViewProtected;
-        if (nativeView && isAndroid) {
-            const recycle = this.recycleNativeView;
-            if (recycle === "always" || (recycle === "auto" && !this._disableNativeViewRecycling)) {
-                resetNativeView(this);
-                if (this._isPaddingRelative) {
-                    nativeView.setPaddingRelative(this._defaultPaddingLeft, this._defaultPaddingTop, this._defaultPaddingRight, this._defaultPaddingBottom);
-                } else {
-                    nativeView.setPadding(this._defaultPaddingLeft, this._defaultPaddingTop, this._defaultPaddingRight, this._defaultPaddingBottom);
-                }
-                this.resetNativeView();
-            }
-        }
+        // const nativeView = this.nativeViewProtected;
+        // if (nativeView && isAndroid) {
+        //     const recycle = this.recycleNativeView;
+        //     if (recycle === "always" || (recycle === "auto" && !this._disableNativeViewRecycling)) {
+        //         resetNativeView(this);
+        //         if (this._isPaddingRelative) {
+        //             nativeView.setPaddingRelative(this._defaultPaddingLeft, this._defaultPaddingTop, this._defaultPaddingRight, this._defaultPaddingBottom);
+        //         } else {
+        //             nativeView.setPadding(this._defaultPaddingLeft, this._defaultPaddingTop, this._defaultPaddingRight, this._defaultPaddingBottom);
+        //         }
+        //         this.resetNativeView();
+        //     }
+        // }
 
         if (this._cssState) {
             this._cancelAllAnimations();
         }
     }
 
+    _setupAsRootView(context: any): void {
+        this._setupUI(context);
+    }
+
     @profile
     public _setupUI(context: android.content.Context, atIndex?: number, parentIsLoaded?: boolean) {
 
@@ -706,10 +711,10 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
 
         let nativeView;
         if (isAndroid) {
-            const recycle = this.recycleNativeView;
-            if (recycle === "always" || (recycle === "auto" && !this._disableNativeViewRecycling)) {
-                nativeView = <android.view.View>getNativeView(context, this.typeName);
-            }
+            // const recycle = this.recycleNativeView;
+            // if (recycle === "always" || (recycle === "auto" && !this._disableNativeViewRecycling)) {
+            //     nativeView = <android.view.View>getNativeView(context, this.typeName);
+            // }
 
             if (!nativeView) {
                 nativeView = <android.view.View>this.createNativeView();
@@ -790,15 +795,15 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
 
     @profile
     public _tearDownUI(force?: boolean) {
+        if (traceEnabled()) {
+            traceWrite(`${this}._tearDownUI(${force})`, traceCategories.VisualTreeEvents);
+        }
+
         // No context means we are already teared down.
         if (!this._context) {
             return;
         }
 
-        if (traceEnabled()) {
-            traceWrite(`${this}._tearDownUI(${force})`, traceCategories.VisualTreeEvents);
-        }
-
         this.resetNativeViewInternal();
 
         this.eachChild((child) => {
@@ -810,18 +815,24 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
             this.parent._removeViewFromNativeVisualTree(this);
         }
 
-        const nativeView = this.nativeViewProtected;
-        if (nativeView && isAndroid) {
-            const recycle = this.recycleNativeView;
-            if (recycle === "always" || (recycle === "auto" && !this._disableNativeViewRecycling)) {
-                // const nativeParent = isAndroid ? (<android.view.View>nativeView).getParent() : (<UIView>nativeView).superview;
-                const nativeParent = (<android.view.View>nativeView).getParent();
-                const animation = (<android.view.View>nativeView).getAnimation();
-                if (!nativeParent && !animation) {
-                    putNativeView(this._context, this);
-                }
-            }
-        }
+        // const nativeView = this.nativeViewProtected;
+        // if (nativeView && isAndroid) {
+        //     const recycle = this.recycleNativeView;
+        //     let shouldRecycle = false;
+        //     if (recycle === "always") {
+        //         shouldRecycle = true;
+        //     } else if (recycle === "auto" && !this._disableNativeViewRecycling) {
+        //         const propertiesSet = Object.getOwnPropertySymbols(this).length + Object.getOwnPropertySymbols(this.style).length / 2;
+        //         shouldRecycle = propertiesSet <= this.recyclePropertyCounter;
+        //     }
+
+        //     // const nativeParent = isAndroid ? (<android.view.View>nativeView).getParent() : (<UIView>nativeView).superview;
+        //     const nativeParent = (<android.view.View>nativeView).getParent();
+        //     const animation = (<android.view.View>nativeView).getAnimation();
+        //     if (shouldRecycle && !nativeParent && !animation) {
+        //         putNativeView(this._context, this);
+        //     }
+        // }
 
         this.disposeNativeView();
 
@@ -941,6 +952,21 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
             }
         }
     }
+
+    public toString(): string {
+        let str = this.typeName;
+        if (this.id) {
+            str += `<${this.id}>`;
+        } else {
+            str += `(${this._domId})`;
+        }
+        let source = Source.get(this);
+        if (source) {
+            str += `@${source};`;
+        }
+
+        return str;
+    }
 }
 
 ViewBase.prototype.isCollapsed = false;
diff --git a/tns-core-modules/ui/core/view/view-common.ts b/tns-core-modules/ui/core/view/view-common.ts
index 41c843c5c..9d28e294e 100644
--- a/tns-core-modules/ui/core/view/view-common.ts
+++ b/tns-core-modules/ui/core/view/view-common.ts
@@ -2,9 +2,6 @@
 import { View as ViewDefinition, Point, Size, Color, dip } from ".";
 import { HorizontalAlignment, VerticalAlignment, Visibility, Length, PercentLength } from "../../styling/style-properties";
 
-// Types.
-import { Source } from "../../../utils/debug";
-
 import {
     ViewBase, Property, booleanConverter, EventData, layout,
     getEventOrGestureName, traceEnabled, traceWrite, traceCategories
@@ -747,21 +744,6 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
         super.resetNativeView();
     }
 
-    public toString(): string {
-        let str = this.typeName;
-        if (this.id) {
-            str += `<${this.id}>`;
-        } else {
-            str += `(${this._domId})`;
-        }
-        let source = Source.get(this);
-        if (source) {
-            str += `@${source};`;
-        }
-
-        return str;
-    }
-
     public _setNativeViewFrame(nativeView: any, frame: any) {
         //
     }
diff --git a/tns-core-modules/ui/core/view/view.android.ts b/tns-core-modules/ui/core/view/view.android.ts
index 8bdb0b9e8..802289e08 100644
--- a/tns-core-modules/ui/core/view/view.android.ts
+++ b/tns-core-modules/ui/core/view/view.android.ts
@@ -7,7 +7,8 @@ import { CacheLayerType } from "../../../utils/utils";
 import { Background, ad as androidBackground } from "../../styling/background";
 import {
     ViewCommon, layout, isEnabledProperty, originXProperty, originYProperty, automationTextProperty, isUserInteractionEnabledProperty,
-    traceEnabled, traceWrite, traceCategories, traceNotifyEvent
+    traceEnabled, traceWrite, traceCategories, traceNotifyEvent, 
+    paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty
 } from "./view-common";
 
 import {
@@ -486,7 +487,18 @@ export class View extends ViewCommon {
         } else {
             const nativeView = this.nativeViewProtected;
             org.nativescript.widgets.ViewHelper.setBackground(nativeView, value);
-            nativeView.setPadding(this._defaultPaddingLeft, this._defaultPaddingTop, this._defaultPaddingRight, this._defaultPaddingBottom);
+            
+            const style = this.style;
+            const paddingTop = paddingTopProperty.isSet(style) ? this.effectivePaddingTop : this._defaultPaddingTop;
+            const paddingRight = paddingRightProperty.isSet(style) ? this.effectivePaddingRight : this._defaultPaddingRight;
+            const paddingBottom = paddingBottomProperty.isSet(style) ? this.effectivePaddingBottom : this._defaultPaddingBottom;
+            const paddingLeft = paddingLeftProperty.isSet(style) ? this.effectivePaddingLeft : this._defaultPaddingLeft;
+
+            if (this._isPaddingRelative) {
+                nativeView.setPaddingRelative(paddingLeft, paddingTop, paddingRight, paddingBottom);
+            } else {
+                nativeView.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
+            }
 
             (<any>nativeView).background = undefined;
             const cache = <CacheLayerType><any>nativeView;
diff --git a/tns-core-modules/ui/frame/frame-common.ts b/tns-core-modules/ui/frame/frame-common.ts
index d8f40ffa4..0a78df5fa 100644
--- a/tns-core-modules/ui/frame/frame-common.ts
+++ b/tns-core-modules/ui/frame/frame-common.ts
@@ -334,6 +334,22 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition {
         this._updateActionBar();
     }
 
+    public _findEntryForTag(fragmentTag: string): BackstackEntry {
+        let entry: BackstackEntry;
+        if (this._currentEntry && this._currentEntry.fragmentTag === fragmentTag) {
+            entry = this._currentEntry;
+        } else {
+            entry = this._backStack.find((value) => value.fragmentTag === fragmentTag);
+            // on API 26 fragments are recreated lazily after activity is destroyed.
+            if (!entry) {
+                const navigationItem = this._navigationQueue.find((value) => value.entry.fragmentTag === fragmentTag);
+                entry = navigationItem ? navigationItem.entry : undefined;
+            }
+        }
+
+        return entry;
+    }
+
     public navigationQueueIsEmpty(): boolean {
         return this._navigationQueue.length === 0;
     }
diff --git a/tns-core-modules/ui/frame/frame.android.ts b/tns-core-modules/ui/frame/frame.android.ts
index 16c05e12f..cbc3eab31 100644
--- a/tns-core-modules/ui/frame/frame.android.ts
+++ b/tns-core-modules/ui/frame/frame.android.ts
@@ -419,13 +419,7 @@ function findPageForFragment(fragment: android.app.Fragment, frame: Frame) {
         return;
     }
 
-    let entry: BackstackEntry;
-    if (frame._currentEntry && frame._currentEntry.fragmentTag === fragmentTag) {
-        entry = frame._currentEntry;
-    } else {
-        entry = frame.backStack.find((value) => value.fragmentTag === fragmentTag);
-    }
-
+    const entry = frame._findEntryForTag(fragmentTag);
     const page = entry ? entry.resolvedPage : undefined;
     if (page) {
         const callbacks: FragmentCallbacksImplementation = fragment[CALLBACKS];
@@ -668,7 +662,7 @@ class ActivityCallbacksImplementation implements AndroidActivityCallbacks {
         this._rootView = rootView;
 
         // Initialize native visual tree;
-        rootView._setupUI(activity);
+        rootView._setupAsRootView(activity);
         activity.setContentView(rootView.nativeViewProtected, new org.nativescript.widgets.CommonLayoutParams());
         // frameId is negative w
         if (frame) {
diff --git a/tns-core-modules/ui/frame/frame.d.ts b/tns-core-modules/ui/frame/frame.d.ts
index 81560d365..2ae6c98d1 100644
--- a/tns-core-modules/ui/frame/frame.d.ts
+++ b/tns-core-modules/ui/frame/frame.d.ts
@@ -132,6 +132,10 @@ export class Frame extends View {
      * @private
      */
     _getNavBarVisible(page: Page): boolean;
+    /**
+     * @private
+     */
+    _findEntryForTag(fragmentTag: string): BackstackEntry;
     //@endprivate
 
     /**
diff --git a/tns-core-modules/ui/frame/frame.ios.ts b/tns-core-modules/ui/frame/frame.ios.ts
index a84c6eeac..46c8e94eb 100644
--- a/tns-core-modules/ui/frame/frame.ios.ts
+++ b/tns-core-modules/ui/frame/frame.ios.ts
@@ -20,8 +20,6 @@ const DELEGATE = "_delegate";
 
 let navDepth = -1;
 
-const FRAME_CONTEXT = {};
-
 export class Frame extends FrameBase {
     private _ios: iOSFrame;
     private _paramToNavigate: any;
@@ -35,13 +33,6 @@ export class Frame extends FrameBase {
     public _bottom: number;
     public _isInitialNavigation: boolean = true;
 
-    public get _context(): any {
-        return FRAME_CONTEXT;
-    }
-    public set _context(value: any) {
-        throw new Error("Frame _context is readonly");
-    }
-
     constructor() {
         super();
         this._ios = new iOSFrame(this);
@@ -255,10 +246,6 @@ export class Frame extends FrameBase {
         return this._ios;
     }
 
-    // get nativeView(): any {
-    //     return this._ios.controller.view;
-    // }
-
     public static get defaultAnimatedNavigation(): boolean {
         return FrameBase.defaultAnimatedNavigation;
     }
@@ -495,10 +482,10 @@ class UINavigationControllerImpl extends UINavigationController {
     }
 
     @profile
-    public viewDidLoad(): void {
-        super.viewDidLoad();
+    public viewWillAppear(animated: boolean): void {
+        super.viewWillAppear(animated);
         let owner = this._owner.get();
-        if (owner) {
+        if (owner && (!owner.isLoaded && !owner.parent)) {
             owner.onLoaded();
         }
     }