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

Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev am: 56e2aeba8f

Browse Source 
am: 6e90b67dfa

* commit '6e90b67dfaf02c236b542951dfaac3a7d805ef21':
  Move Activity multi-window event logic out of the public methods

Change-Id: I1eb6677d8ecd2208b20c2094eb4d708f6e20bc14
This commit is contained in:
Adam Powell
2016-05-10 21:40:16 +00:00
committed by android-build-merger
parent eb80f34310 6e90b67dfa
commit 82e644de2f
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1879,14 +1879,9 @@ public class Activity extends ContextThemeWrapper
*
* @param isInMultiWindowMode True if the activity is in multi-window mode.
*/
@CallSuper
public void onMultiWindowModeChanged(boolean isInMultiWindowMode) {
if (DEBUG_LIFECYCLE) Slog.v(TAG,
"onMultiWindowModeChanged " + this + ": " + isInMultiWindowMode);
mFragments.dispatchMultiWindowModeChanged(isInMultiWindowMode);
if (mWindow != null) {
mWindow.onMultiWindowModeChanged();
}
// Left deliberately empty. There should be no side effects if a direct
// subclass of Activity does not call super.
}
/**
@@ -1909,11 +1904,9 @@ public class Activity extends ContextThemeWrapper
*
* @param isInPictureInPictureMode True if the activity is in picture-in-picture mode.
*/
@CallSuper
public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
if (DEBUG_LIFECYCLE) Slog.v(TAG,
"onPictureInPictureModeChanged " + this + ": " + isInPictureInPictureMode);
mFragments.dispatchPictureInPictureModeChanged(isInPictureInPictureMode);
// Left deliberately empty. There should be no side effects if a direct
// subclass of Activity does not call super.
}
/**
@@ -6875,6 +6868,23 @@ public class Activity extends ContextThemeWrapper
}
}
final void dispatchMultiWindowModeChanged(boolean isInMultiWindowMode) {
if (DEBUG_LIFECYCLE) Slog.v(TAG,
"dispatchMultiWindowModeChanged " + this + ": " + isInMultiWindowMode);
mFragments.dispatchMultiWindowModeChanged(isInMultiWindowMode);
if (mWindow != null) {
mWindow.onMultiWindowModeChanged();
}
onMultiWindowModeChanged(isInMultiWindowMode);
}
final void dispatchPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
if (DEBUG_LIFECYCLE) Slog.v(TAG,
"dispatchPictureInPictureModeChanged " + this + ": " + isInPictureInPictureMode);
mFragments.dispatchPictureInPictureModeChanged(isInPictureInPictureMode);
onPictureInPictureModeChanged(isInPictureInPictureMode);
}
/**
* @hide
*/

4
core/java/android/app/ActivityThread.java
View File

@@ -2906,14 +2906,14 @@ public final class ActivityThread {
private void handleMultiWindowModeChanged(IBinder token, boolean isInMultiWindowMode) {
final ActivityClientRecord r = mActivities.get(token);
if (r != null) {
r.activity.onMultiWindowModeChanged(isInMultiWindowMode);
r.activity.dispatchMultiWindowModeChanged(isInMultiWindowMode);
}
}
private void handlePictureInPictureModeChanged(IBinder token, boolean isInPipMode) {
final ActivityClientRecord r = mActivities.get(token);
if (r != null) {
r.activity.onPictureInPictureModeChanged(isInPipMode);
r.activity.dispatchPictureInPictureModeChanged(isInPipMode);
}
}