Skip to content

Use again android.app.Activity as it is support/x independent #1321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2019
+4 −4
Merged

Use again android.app.Activity as it is support/x independent #1321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test-app/app/src/main/assets/app/MyActivity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}

@JavaProxy("com.tns.NativeScriptActivity")
class MyActivity extends android.support.v7.app.AppCompatActivity
class MyActivity extends android.app.Activity
{
onCreate(bundle: android.os.Bundle)
{
Expand Down Expand Up @@ -61,4 +61,4 @@ var MyActivity = (function (_super) {
JavaProxy("com.tns.NativeScriptActivity")
], MyActivity);
return MyActivity;
})(android.support.v7.app.AppCompatActivity);
})(android.app.Activity);
2 changes: 1 addition & 1 deletion ...tools/jsparser/tests/cases/decorated_double_assignment_ts/app/myCustomActivity.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Bundle = android.os.Bundle;

@JavaProxy('org.nativescript.MyCustomActivity')
export class TestActivity extends android.support.v7.app.AppCompatActivity {
export class TestActivity extends android.app.Activity {
static readonly TEST1: string = "my_test";
public onCreate(savedInstanceState?: Bundle): void {
super.onCreate(savedInstanceState);
Expand Down
2 changes: 1 addition & 1 deletion ...ls/jsparser/tests/cases/decorated_double_assignment_ts/app/myCustomActivity_ts.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ var TestActivity = (function (_super) {
JavaProxy('org.nativescript.MyCustomActivity')
], TestActivity);
return TestActivity;
}(android.support.v7.app.AppCompatActivity));
}(android.app.Activity));
exports.TestActivity = TestActivity;