Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Deprecated APIs related to ActivityGroup"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-08-27 13:53:38 +00:00
committed by Android (Google) Code Review
parent b41831d9b0 c380f0279c
commit f468327f9f
3 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/current.txt
View File

@@ -3690,11 +3690,11 @@ package android.app {
method public <T extends android.view.View> T findViewById(@IdRes int);
method public void finish();
method public void finishActivity(int);
method public void finishActivityFromChild(@NonNull android.app.Activity, int);
method @Deprecated public void finishActivityFromChild(@NonNull android.app.Activity, int);
method public void finishAffinity();
method public void finishAfterTransition();
method public void finishAndRemoveTask();
method public void finishFromChild(android.app.Activity);
method @Deprecated public void finishFromChild(android.app.Activity);
method @Nullable public android.app.ActionBar getActionBar();
method public final android.app.Application getApplication();
method @Nullable public android.content.ComponentName getCallingActivity();
@@ -3743,7 +3743,7 @@ package android.app {
method @Deprecated public final android.database.Cursor managedQuery(android.net.Uri, String[], String, String[], String);
method public boolean moveTaskToBack(boolean);
method public boolean navigateUpTo(android.content.Intent);
method public boolean navigateUpToFromChild(android.app.Activity, android.content.Intent);
method @Deprecated public boolean navigateUpToFromChild(android.app.Activity, android.content.Intent);
method @CallSuper public void onActionModeFinished(android.view.ActionMode);
method @CallSuper public void onActionModeStarted(android.view.ActionMode);
method public void onActivityReenter(int, android.content.Intent);
@@ -3787,7 +3787,7 @@ package android.app {
method public void onMultiWindowModeChanged(boolean, android.content.res.Configuration);
method @Deprecated public void onMultiWindowModeChanged(boolean);
method public boolean onNavigateUp();
method public boolean onNavigateUpFromChild(android.app.Activity);
method @Deprecated public boolean onNavigateUpFromChild(android.app.Activity);
method protected void onNewIntent(android.content.Intent);
method public boolean onOptionsItemSelected(@NonNull android.view.MenuItem);
method public void onOptionsMenuClosed(android.view.Menu);
@@ -3894,16 +3894,16 @@ package android.app {
method @Nullable public android.view.ActionMode startActionMode(android.view.ActionMode.Callback, int);
method public void startActivityForResult(@RequiresPermission android.content.Intent, int);
method public void startActivityForResult(@RequiresPermission android.content.Intent, int, @Nullable android.os.Bundle);
method public void startActivityFromChild(@NonNull android.app.Activity, @RequiresPermission android.content.Intent, int);
method public void startActivityFromChild(@NonNull android.app.Activity, @RequiresPermission android.content.Intent, int, @Nullable android.os.Bundle);
method @Deprecated public void startActivityFromChild(@NonNull android.app.Activity, @RequiresPermission android.content.Intent, int);
method @Deprecated public void startActivityFromChild(@NonNull android.app.Activity, @RequiresPermission android.content.Intent, int, @Nullable android.os.Bundle);
method @Deprecated public void startActivityFromFragment(@NonNull android.app.Fragment, @RequiresPermission android.content.Intent, int);
method @Deprecated public void startActivityFromFragment(@NonNull android.app.Fragment, @RequiresPermission android.content.Intent, int, @Nullable android.os.Bundle);
method public boolean startActivityIfNeeded(@RequiresPermission @NonNull android.content.Intent, int);
method public boolean startActivityIfNeeded(@RequiresPermission @NonNull android.content.Intent, int, @Nullable android.os.Bundle);
method public void startIntentSenderForResult(android.content.IntentSender, int, @Nullable android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;
method public void startIntentSenderForResult(android.content.IntentSender, int, @Nullable android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException;
method public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;
method public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int, @Nullable android.os.Bundle) throws android.content.IntentSender.SendIntentException;
method @Deprecated public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;
method @Deprecated public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int, @Nullable android.os.Bundle) throws android.content.IntentSender.SendIntentException;
method public void startLocalVoiceInteraction(android.os.Bundle);
method public void startLockTask();
method @Deprecated public void startManagingCursor(android.database.Cursor);

48
core/java/android/app/Activity.java
View File

@@ -4341,7 +4341,9 @@ public class Activity extends ContextThemeWrapper
* The default implementation simply calls onNavigateUp() on this activity (the parent).
*
* @param child The activity making the call.
* @deprecated Use {@link #onNavigateUp()} instead.
*/
@Deprecated
public boolean onNavigateUpFromChild(Activity child) {
return onNavigateUp();
}
@@ -5768,7 +5770,10 @@ public class Activity extends ContextThemeWrapper
*
* @see #startActivity
* @see #startActivityForResult
* @deprecated Use {@code androidx.fragment.app.FragmentActivity#startActivityFromFragment(
* androidx.fragment.app.Fragment,Intent,int)}
*/
@Deprecated
public void startActivityFromChild(@NonNull Activity child, @RequiresPermission Intent intent,
int requestCode) {
startActivityFromChild(child, intent, requestCode, null);
@@ -5792,7 +5797,10 @@ public class Activity extends ContextThemeWrapper
*
* @see #startActivity
* @see #startActivityForResult
* @deprecated Use {@code androidx.fragment.app.FragmentActivity#startActivityFromFragment(
* androidx.fragment.app.Fragment,Intent,int,Bundle)}
*/
@Deprecated
public void startActivityFromChild(@NonNull Activity child, @RequiresPermission Intent intent,
int requestCode, @Nullable Bundle options) {
options = transferSpringboardActivityOptions(options);
@@ -5821,8 +5829,8 @@ public class Activity extends ContextThemeWrapper
* @see Fragment#startActivity
* @see Fragment#startActivityForResult
*
* @deprecated Use {@link android.support.v4.app.FragmentActivity#startActivityFromFragment(
* android.support.v4.app.Fragment,Intent,int)}
* @deprecated Use {@code androidx.fragment.app.FragmentActivity#startActivityFromFragment(
* androidx.fragment.app.Fragment,Intent,int)}
*/
@Deprecated
public void startActivityFromFragment(@NonNull Fragment fragment,
@@ -5850,8 +5858,8 @@ public class Activity extends ContextThemeWrapper
* @see Fragment#startActivity
* @see Fragment#startActivityForResult
*
* @deprecated Use {@link android.support.v4.app.FragmentActivity#startActivityFromFragment(
* android.support.v4.app.Fragment,Intent,int,Bundle)}
* @deprecated Use {@code androidx.fragment.app.FragmentActivity#startActivityFromFragment(
* androidx.fragment.app.Fragment,Intent,int,Bundle)}
*/
@Deprecated
public void startActivityFromFragment(@NonNull Fragment fragment,
@@ -5859,10 +5867,7 @@ public class Activity extends ContextThemeWrapper
startActivityForResult(fragment.mWho, intent, requestCode, options);
}
/**
* @hide
*/
public void startActivityAsUserFromFragment(@NonNull Fragment fragment,
private void startActivityAsUserFromFragment(@NonNull Fragment fragment,
@RequiresPermission Intent intent, int requestCode, @Nullable Bundle options,
UserHandle user) {
startActivityForResultAsUser(intent, fragment.mWho, requestCode, options, user);
@@ -5903,7 +5908,10 @@ public class Activity extends ContextThemeWrapper
/**
* Same as calling {@link #startIntentSenderFromChild(Activity, IntentSender,
* int, Intent, int, int, int, Bundle)} with no options.
* @deprecated Use {@link #startIntentSenderForResult(IntentSender, int, Intent, int, int, int)}
* instead.
*/
@Deprecated
public void startIntentSenderFromChild(Activity child, IntentSender intent,
int requestCode, Intent fillInIntent, int flagsMask, int flagsValues,
int extraFlags)
@@ -5917,7 +5925,11 @@ public class Activity extends ContextThemeWrapper
* taking a IntentSender; see
* {@link #startIntentSenderForResult(IntentSender, int, Intent, int, int, int)}
* for more information.
* @deprecated Use
* {@link #startIntentSenderForResult(IntentSender, int, Intent, int, int, int, Bundle)}
* instead.
*/
@Deprecated
public void startIntentSenderFromChild(Activity child, IntentSender intent,
int requestCode, Intent fillInIntent, int flagsMask, int flagsValues,
int extraFlags, @Nullable Bundle options)
@@ -5927,17 +5939,15 @@ public class Activity extends ContextThemeWrapper
}
/**
* Like {@link #startIntentSenderFromChild}, but taking a Fragment; see
* Like {@link #startIntentSender}, but taking a Fragment; see
* {@link #startIntentSenderForResult(IntentSender, int, Intent, int, int, int)}
* for more information.
*
* @hide
*/
public void startIntentSenderFromChildFragment(Fragment child, IntentSender intent,
private void startIntentSenderFromFragment(Fragment fragment, IntentSender intent,
int requestCode, Intent fillInIntent, int flagsMask, int flagsValues,
int extraFlags, @Nullable Bundle options)
@Nullable Bundle options)
throws IntentSender.SendIntentException {
startIntentSenderForResultInner(intent, child.mWho, requestCode, fillInIntent,
startIntentSenderForResultInner(intent, fragment.mWho, requestCode, fillInIntent,
flagsMask, flagsValues, options);
}
@@ -6279,7 +6289,9 @@ public class Activity extends ContextThemeWrapper
* @param child The activity making the call.
*
* @see #finish
* @deprecated Use {@link #finish()} instead.
*/
@Deprecated
public void finishFromChild(Activity child) {
finish();
}
@@ -6326,7 +6338,9 @@ public class Activity extends ContextThemeWrapper
* @param child The activity making the call.
* @param requestCode Request code that had been used to start the
* activity.
* @deprecated Use {@link #finishActivity(int)} instead.
*/
@Deprecated
public void finishActivityFromChild(@NonNull Activity child, int requestCode) {
try {
ActivityTaskManager.getService()
@@ -7569,7 +7583,9 @@ public class Activity extends ContextThemeWrapper
* @return true if up navigation successfully reached the activity indicated by upIntent and
* upIntent was delivered to it. false if an instance of the indicated activity could
* not be found and this activity was simply finished normally.
* @deprecated Use {@link #navigateUpTo(Intent)} instead.
*/
@Deprecated
public boolean navigateUpToFromChild(Activity child, Intent upIntent) {
return navigateUpTo(upIntent);
}
@@ -8623,8 +8639,8 @@ public class Activity extends ContextThemeWrapper
startIntentSenderForResultInner(intent, fragment.mWho, requestCode, fillInIntent,
flagsMask, flagsValues, options);
} else if (options != null) {
mParent.startIntentSenderFromChildFragment(fragment, intent, requestCode,
fillInIntent, flagsMask, flagsValues, extraFlags, options);
mParent.startIntentSenderFromFragment(fragment, intent, requestCode,
fillInIntent, flagsMask, flagsValues, options);
}
}

3
core/java/android/app/Instrumentation.java
View File

@@ -1670,7 +1670,6 @@ public class Instrumentation {
*
* @see Activity#startActivity(Intent)
* @see Activity#startActivityForResult(Intent, int)
* @see Activity#startActivityFromChild
*
* {@hide}
*/
@@ -1815,7 +1814,6 @@ public class Instrumentation {
*
* @see Activity#startActivity(Intent)
* @see Activity#startActivityForResult(Intent, int)
* @see Activity#startActivityFromChild
*
* {@hide}
*/
@@ -1883,7 +1881,6 @@ public class Instrumentation {
*
* @see Activity#startActivity(Intent)
* @see Activity#startActivityForResult(Intent, int)
* @see Activity#startActivityFromChild
*
* {@hide}
*/