javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mdonev/release-to-master20190621

Browse Source
This commit is contained in:
Manol Donev
2019-06-21 15:39:51 +03:00
committed by GitHub
parent ae598f2c07 ad8ce2c95d
commit 4299d4aedc
1777 changed files with 188346 additions and 146518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tns-core-modules/ui/core/view/view.android.ts
View File

@@ -55,7 +55,7 @@ interface TouchListener {
}
interface DialogFragment {
new(): android.support.v4.app.DialogFragment;
new(): androidx.fragment.app.DialogFragment;
}
function initializeTouchListener(): void {
@@ -133,7 +133,7 @@ function initializeDialogFragment() {
}
}
class DialogFragmentImpl extends android.support.v4.app.DialogFragment {
class DialogFragmentImpl extends androidx.fragment.app.DialogFragment {
public owner: View;
private _fullscreen: boolean;
private _stretched: boolean;
@@ -155,7 +155,7 @@ function initializeDialogFragment() {
this._stretched = options.stretched;
this._dismissCallback = options.dismissCallback;
this._shownCallback = options.shownCallback;
this.setStyle(android.support.v4.app.DialogFragment.STYLE_NO_TITLE, 0);
this.setStyle(androidx.fragment.app.DialogFragment.STYLE_NO_TITLE, 0);
let theme = this.getTheme();
if (this._fullscreen) {
@@ -255,14 +255,14 @@ function getModalOptions(domId: number): DialogOptions {
export class View extends ViewCommon {
public static androidBackPressedEvent = androidBackPressedEvent;
public _dialogFragment: android.support.v4.app.DialogFragment;
public _dialogFragment: androidx.fragment.app.DialogFragment;
private _isClickable: boolean;
private touchListenerIsSet: boolean;
private touchListener: android.view.View.OnTouchListener;
private layoutChangeListenerIsSet: boolean;
private layoutChangeListener: android.view.View.OnLayoutChangeListener;
private _manager: android.support.v4.app.FragmentManager;
private _rootManager: android.support.v4.app.FragmentManager;
private _manager: androidx.fragment.app.FragmentManager;
private _rootManager: androidx.fragment.app.FragmentManager;
private _originalElevation: number;
private _originalStateListAnimator: any; /* android.animation.StateListAnimator; */
@@ -296,19 +296,19 @@ export class View extends ViewCommon {
}
}
public _getChildFragmentManager(): android.support.v4.app.FragmentManager {
public _getChildFragmentManager(): androidx.fragment.app.FragmentManager {
return null;
}
public _getRootFragmentManager(): android.support.v4.app.FragmentManager {
public _getRootFragmentManager(): androidx.fragment.app.FragmentManager {
if (!this._rootManager && this._context) {
this._rootManager = (<android.support.v4.app.FragmentActivity>this._context).getSupportFragmentManager();
this._rootManager = (<androidx.fragment.app.FragmentActivity>this._context).getSupportFragmentManager();
}
return this._rootManager;
}
public _getFragmentManager(): android.support.v4.app.FragmentManager {
public _getFragmentManager(): androidx.fragment.app.FragmentManager {
let manager = this._manager;
if (!manager) {
let view: View = this;

5
tns-core-modules/ui/core/view/view.d.ts vendored
View File

@@ -707,11 +707,8 @@ export abstract class View extends ViewBase {
/**
* @private
*/
_getFragmentManager(): any; /* androidx.fragment.app.FragmentManager */
_handleLivesync(context?: { type: string, path: string }): boolean;
/**
* @private
*/
_getFragmentManager(): any; /* android.support.v4.app.FragmentManager */
/**
* Updates styleScope or create new styleScope.