github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-01 02:12:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.0.x (undeprecate)

Browse Source
This commit is contained in:
Andrew Grieve 2014-07-14 14:28:56 -04:00
commit a03fdaba39
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
framework/src/org/apache/cordova/PluginManager.java
View File

@ -74,7 +74,6 @@ public class PluginManager {
/** /**
* Init when loading a new HTML page into webview. * Init when loading a new HTML page into webview.
*/ */
@Deprecated // Should not be exposed as public.
public void init() { public void init() {
LOG.d(TAG, "init()"); LOG.d(TAG, "init()");
this.onPause(false); this.onPause(false);
@ -207,7 +206,6 @@ public class PluginManager {
* *
* @param multitasking Flag indicating if multitasking is turned on for app * @param multitasking Flag indicating if multitasking is turned on for app
*/ */
@Deprecated // Should not be public
public void onPause(boolean multitasking) { public void onPause(boolean multitasking) {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onPause(multitasking); plugin.onPause(multitasking);
@ -219,7 +217,6 @@ public class PluginManager {
* *
* @param multitasking Flag indicating if multitasking is turned on for app * @param multitasking Flag indicating if multitasking is turned on for app
*/ */
@Deprecated // Should not be public
public void onResume(boolean multitasking) { public void onResume(boolean multitasking) {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onResume(multitasking); plugin.onResume(multitasking);
@ -229,7 +226,6 @@ public class PluginManager {
/** /**
* The final call you receive before your activity is destroyed. * The final call you receive before your activity is destroyed.
*/ */
@Deprecated // Should not be public
public void onDestroy() { public void onDestroy() {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onDestroy(); plugin.onDestroy();
@ -260,7 +256,6 @@ public class PluginManager {
/** /**
* Called when the activity receives a new intent. * Called when the activity receives a new intent.
*/ */
@Deprecated // Should not be public
public void onNewIntent(Intent intent) { public void onNewIntent(Intent intent) {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onNewIntent(intent); plugin.onNewIntent(intent);
@ -273,7 +268,6 @@ public class PluginManager {
* @param url The URL that is being changed to. * @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. * @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) { public boolean onOverrideUrlLoading(String url) {
// Deprecated way to intercept URLs. (process <url-filter> tags). // Deprecated way to intercept URLs. (process <url-filter> tags).
// Instead, plugins should not include <url-filter> and instead ensure // Instead, plugins should not include <url-filter> and instead ensure
@ -291,7 +285,6 @@ public class PluginManager {
/** /**
* Called when the app navigates or refreshes. * Called when the app navigates or refreshes.
*/ */
@Deprecated // Should not be public
public void onReset() { public void onReset() {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onReset(); plugin.onReset();