Skip to content

Commit 91b46ea

Browse files
committed
Extended the tracing information for Bindings and Android NativeLifecycle.
1 parent 2c4a917 commit 91b46ea

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

ui/core/bindable.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export class Bindable extends dependencyObservable.DependencyObservable implemen
100100
}
101101

102102
public _onPropertyChanged(property: dependencyObservable.Property, oldValue: any, newValue: any) {
103-
trace.write("Bindable._onPropertyChanged(" + this + ") " + property.name, trace.categories.Binding);
103+
trace.write(`${this}._onPropertyChanged(${property.name}, ${oldValue}, ${newValue})`, trace.categories.Binding);
104104
super._onPropertyChanged(property, oldValue, newValue);
105105
if (this instanceof viewModule.View) {
106106
if (property.metadata.inheritable && (<viewModule.View>(<any>this))._isInheritedChange() === true) {
@@ -110,11 +110,11 @@ export class Bindable extends dependencyObservable.DependencyObservable implemen
110110
var binding = this.bindings[property.name];
111111
if (binding && !binding.updating) {
112112
if (binding.options.twoWay) {
113-
trace.write("_updateTwoWayBinding(" + this + "): " + property.name, trace.categories.Binding);
113+
trace.write(`${this}._updateTwoWayBinding(${property.name}, ${newValue});` + property.name, trace.categories.Binding);
114114
this._updateTwoWayBinding(property.name, newValue);
115115
}
116116
else {
117-
trace.write("_onPropertyChanged(" + this + ") removing binding for property: " + property.name, trace.categories.Binding);
117+
trace.write(`${this}.unbind(${property.name});`, trace.categories.Binding);
118118
this.unbind(property.name);
119119
}
120120
}
@@ -129,10 +129,7 @@ export class Bindable extends dependencyObservable.DependencyObservable implemen
129129
continue;
130130
}
131131

132-
trace.write(
133-
"Binding target: " + binding.target.get() +
134-
" targetProperty: " + binding.options.targetProperty +
135-
" to the changed context: " + newValue, trace.categories.Binding);
132+
trace.write(`Binding ${binding.target.get()}.${binding.options.targetProperty} to new context ${newValue}`, trace.categories.Binding);
136133
binding.unbind();
137134
if (!types.isNullOrUndefined(newValue)) {
138135
binding.bind(newValue);

ui/frame/frame.android.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@ var navDepth = -1;
2424
var PageFragmentBody = (<any>android.app.Fragment).extend({
2525

2626
onCreate: function (savedInstanceState: android.os.Bundle) {
27+
trace.write(`PageFragmentBody.onCreate(${savedInstanceState})`, trace.categories.NativeLifecycle);
2728
this.super.onCreate(savedInstanceState);
2829
this.super.setHasOptionsMenu(true);
2930
},
3031

3132
onCreateView: function (inflater: android.view.LayoutInflater, container: android.view.ViewGroup, savedInstanceState: android.os.Bundle): android.view.View {
33+
trace.write(`PageFragmentBody.onCreateView(${inflater}, ${container}, ${savedInstanceState})`, trace.categories.NativeLifecycle);
3234
var entry = this.entry;
3335
var page = entry.resolvedPage;
3436
if (savedInstanceState && savedInstanceState.getBoolean(HIDDEN, false)) {
@@ -42,6 +44,7 @@ var PageFragmentBody = (<any>android.app.Fragment).extend({
4244
},
4345

4446
onHiddenChanged: function (hidden: boolean) {
47+
trace.write(`PageFragmentBody.onHiddenChanged(${hidden})`, trace.categories.NativeLifecycle);
4548
this.super.onHiddenChanged(hidden);
4649
if (hidden) {
4750
onFragmentHidden(this);
@@ -52,24 +55,28 @@ var PageFragmentBody = (<any>android.app.Fragment).extend({
5255
},
5356

5457
onSaveInstanceState: function (outState: android.os.Bundle) {
58+
trace.write(`PageFragmentBody.onSaveInstanceState(${outState})`, trace.categories.NativeLifecycle);
5559
this.super.onSaveInstanceState(outState);
5660
if (this.isHidden()) {
5761
outState.putBoolean(HIDDEN, true);
5862
}
5963
},
6064

6165
onDestroyView: function () {
66+
trace.write(`PageFragmentBody.onDestroyView()`, trace.categories.NativeLifecycle);
6267
this.super.onDestroyView();
6368
onFragmentHidden(this);
6469
},
6570

6671
onDestroy: function () {
72+
trace.write(`PageFragmentBody.onDestroy()`, trace.categories.NativeLifecycle);
6773
this.super.onDestroy();
6874
utils.GC();
6975
}
7076
});
7177

7278
function onFragmentShown(fragment) {
79+
trace.write(`onFragmentShown(${fragment.toString()})`, trace.categories.NativeLifecycle);
7380
if (fragment[CLEARING_HISTORY]) {
7481
trace.write(`${fragment.toString() } has been shown, but we are currently clearing history. Returning.`, trace.categories.NativeLifecycle);
7582
return null;
@@ -106,6 +113,7 @@ function onFragmentShown(fragment) {
106113
}
107114

108115
function onFragmentHidden(fragment) {
116+
trace.write(`onFragmentHidden(${fragment.toString()})`, trace.categories.NativeLifecycle);
109117
if (fragment[CLEARING_HISTORY]) {
110118
trace.write(`${fragment.toString() } has been hidden, but we are currently clearing history. Returning.`, trace.categories.NativeLifecycle);
111119
return null;

0 commit comments

Comments
 (0)