Skip to content

Commit 028246c

Browse files
authored
Merge pull request #1321 from NativeScript/trifonov/android-activity-tests
Use again android.app.Activity as it is support/x independent
2 parents 0761e5a + 3a10e61 commit 028246c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

test-app/app/src/main/assets/app/MyActivity.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}
1414
1515
@JavaProxy("com.tns.NativeScriptActivity")
16-
class MyActivity extends android.support.v7.app.AppCompatActivity
16+
class MyActivity extends android.app.Activity
1717
{
1818
onCreate(bundle: android.os.Bundle)
1919
{
@@ -61,4 +61,4 @@ var MyActivity = (function (_super) {
6161
JavaProxy("com.tns.NativeScriptActivity")
6262
], MyActivity);
6363
return MyActivity;
64-
})(android.support.v7.app.AppCompatActivity);
64+
})(android.app.Activity);

test-app/build-tools/jsparser/tests/cases/decorated_double_assignment_ts/app/myCustomActivity.android.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Bundle = android.os.Bundle;
22

33
@JavaProxy('org.nativescript.MyCustomActivity')
4-
export class TestActivity extends android.support.v7.app.AppCompatActivity {
4+
export class TestActivity extends android.app.Activity {
55
static readonly TEST1: string = "my_test";
66
public onCreate(savedInstanceState?: Bundle): void {
77
super.onCreate(savedInstanceState);

test-app/build-tools/jsparser/tests/cases/decorated_double_assignment_ts/app/myCustomActivity_ts.android.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ var TestActivity = (function (_super) {
1616
JavaProxy('org.nativescript.MyCustomActivity')
1717
], TestActivity);
1818
return TestActivity;
19-
}(android.support.v7.app.AppCompatActivity));
19+
}(android.app.Activity));
2020
exports.TestActivity = TestActivity;

0 commit comments

Comments
 (0)