mirror of
https://github.com/apache/cordova-android.git
synced 2025-01-19 15:12:51 +08:00
Merge branch 'master' into 4.0.x (undeprecate)
This commit is contained in:
commit
a03fdaba39
@ -74,7 +74,6 @@ public class PluginManager {
|
||||
/**
|
||||
* Init when loading a new HTML page into webview.
|
||||
*/
|
||||
@Deprecated // Should not be exposed as public.
|
||||
public void init() {
|
||||
LOG.d(TAG, "init()");
|
||||
this.onPause(false);
|
||||
@ -207,7 +206,6 @@ public class PluginManager {
|
||||
*
|
||||
* @param multitasking Flag indicating if multitasking is turned on for app
|
||||
*/
|
||||
@Deprecated // Should not be public
|
||||
public void onPause(boolean multitasking) {
|
||||
for (CordovaPlugin plugin : this.pluginMap.values()) {
|
||||
plugin.onPause(multitasking);
|
||||
@ -219,7 +217,6 @@ public class PluginManager {
|
||||
*
|
||||
* @param multitasking Flag indicating if multitasking is turned on for app
|
||||
*/
|
||||
@Deprecated // Should not be public
|
||||
public void onResume(boolean multitasking) {
|
||||
for (CordovaPlugin plugin : this.pluginMap.values()) {
|
||||
plugin.onResume(multitasking);
|
||||
@ -229,7 +226,6 @@ public class PluginManager {
|
||||
/**
|
||||
* The final call you receive before your activity is destroyed.
|
||||
*/
|
||||
@Deprecated // Should not be public
|
||||
public void onDestroy() {
|
||||
for (CordovaPlugin plugin : this.pluginMap.values()) {
|
||||
plugin.onDestroy();
|
||||
@ -260,7 +256,6 @@ public class PluginManager {
|
||||
/**
|
||||
* Called when the activity receives a new intent.
|
||||
*/
|
||||
@Deprecated // Should not be public
|
||||
public void onNewIntent(Intent intent) {
|
||||
for (CordovaPlugin plugin : this.pluginMap.values()) {
|
||||
plugin.onNewIntent(intent);
|
||||
@ -273,7 +268,6 @@ public class PluginManager {
|
||||
* @param url The URL that is being changed to.
|
||||
* @return Return false to allow the URL to load, return true to prevent the URL from loading.
|
||||
*/
|
||||
@Deprecated // Should not be public
|
||||
public boolean onOverrideUrlLoading(String url) {
|
||||
// Deprecated way to intercept URLs. (process <url-filter> tags).
|
||||
// Instead, plugins should not include <url-filter> and instead ensure
|
||||
@ -291,7 +285,6 @@ public class PluginManager {
|
||||
/**
|
||||
* Called when the app navigates or refreshes.
|
||||
*/
|
||||
@Deprecated // Should not be public
|
||||
public void onReset() {
|
||||
for (CordovaPlugin plugin : this.pluginMap.values()) {
|
||||
plugin.onReset();
|
||||
|
Loading…
Reference in New Issue
Block a user