diff --git a/ui/core/bindable.ts b/ui/core/bindable.ts index 4a2f428c8..a598b1a95 100644 --- a/ui/core/bindable.ts +++ b/ui/core/bindable.ts @@ -100,7 +100,7 @@ export class Bindable extends dependencyObservable.DependencyObservable implemen } public _onPropertyChanged(property: dependencyObservable.Property, oldValue: any, newValue: any) { - trace.write("Bindable._onPropertyChanged(" + this + ") " + property.name, trace.categories.Binding); + trace.write(`${this}._onPropertyChanged(${property.name}, ${oldValue}, ${newValue})`, trace.categories.Binding); super._onPropertyChanged(property, oldValue, newValue); if (this instanceof viewModule.View) { if (property.metadata.inheritable && ((this))._isInheritedChange() === true) { @@ -110,11 +110,11 @@ export class Bindable extends dependencyObservable.DependencyObservable implemen var binding = this.bindings[property.name]; if (binding && !binding.updating) { if (binding.options.twoWay) { - trace.write("_updateTwoWayBinding(" + this + "): " + property.name, trace.categories.Binding); + trace.write(`${this}._updateTwoWayBinding(${property.name}, ${newValue});` + property.name, trace.categories.Binding); this._updateTwoWayBinding(property.name, newValue); } else { - trace.write("_onPropertyChanged(" + this + ") removing binding for property: " + property.name, trace.categories.Binding); + trace.write(`${this}.unbind(${property.name});`, trace.categories.Binding); this.unbind(property.name); } } @@ -129,10 +129,7 @@ export class Bindable extends dependencyObservable.DependencyObservable implemen continue; } - trace.write( - "Binding target: " + binding.target.get() + - " targetProperty: " + binding.options.targetProperty + - " to the changed context: " + newValue, trace.categories.Binding); + trace.write(`Binding ${binding.target.get()}.${binding.options.targetProperty} to new context ${newValue}`, trace.categories.Binding); binding.unbind(); if (!types.isNullOrUndefined(newValue)) { binding.bind(newValue); diff --git a/ui/frame/frame.android.ts b/ui/frame/frame.android.ts index 46ead71bf..78ac97190 100644 --- a/ui/frame/frame.android.ts +++ b/ui/frame/frame.android.ts @@ -24,11 +24,13 @@ var navDepth = -1; var PageFragmentBody = (android.app.Fragment).extend({ onCreate: function (savedInstanceState: android.os.Bundle) { + trace.write(`PageFragmentBody.onCreate(${savedInstanceState})`, trace.categories.NativeLifecycle); this.super.onCreate(savedInstanceState); this.super.setHasOptionsMenu(true); }, onCreateView: function (inflater: android.view.LayoutInflater, container: android.view.ViewGroup, savedInstanceState: android.os.Bundle): android.view.View { + trace.write(`PageFragmentBody.onCreateView(${inflater}, ${container}, ${savedInstanceState})`, trace.categories.NativeLifecycle); var entry = this.entry; var page = entry.resolvedPage; if (savedInstanceState && savedInstanceState.getBoolean(HIDDEN, false)) { @@ -42,6 +44,7 @@ var PageFragmentBody = (android.app.Fragment).extend({ }, onHiddenChanged: function (hidden: boolean) { + trace.write(`PageFragmentBody.onHiddenChanged(${hidden})`, trace.categories.NativeLifecycle); this.super.onHiddenChanged(hidden); if (hidden) { onFragmentHidden(this); @@ -52,6 +55,7 @@ var PageFragmentBody = (android.app.Fragment).extend({ }, onSaveInstanceState: function (outState: android.os.Bundle) { + trace.write(`PageFragmentBody.onSaveInstanceState(${outState})`, trace.categories.NativeLifecycle); this.super.onSaveInstanceState(outState); if (this.isHidden()) { outState.putBoolean(HIDDEN, true); @@ -59,17 +63,20 @@ var PageFragmentBody = (android.app.Fragment).extend({ }, onDestroyView: function () { + trace.write(`PageFragmentBody.onDestroyView()`, trace.categories.NativeLifecycle); this.super.onDestroyView(); onFragmentHidden(this); }, onDestroy: function () { + trace.write(`PageFragmentBody.onDestroy()`, trace.categories.NativeLifecycle); this.super.onDestroy(); utils.GC(); } }); function onFragmentShown(fragment) { + trace.write(`onFragmentShown(${fragment.toString()})`, trace.categories.NativeLifecycle); if (fragment[CLEARING_HISTORY]) { trace.write(`${fragment.toString() } has been shown, but we are currently clearing history. Returning.`, trace.categories.NativeLifecycle); return null; @@ -106,6 +113,7 @@ function onFragmentShown(fragment) { } function onFragmentHidden(fragment) { + trace.write(`onFragmentHidden(${fragment.toString()})`, trace.categories.NativeLifecycle); if (fragment[CLEARING_HISTORY]) { trace.write(`${fragment.toString() } has been hidden, but we are currently clearing history. Returning.`, trace.categories.NativeLifecycle); return null;