Merge "Fixed bug with caption not showing for some apps that handle config changes"

2 files changed, 10 insertions, 0 deletions

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 93c6bef5630e..ef84ab05c2b2 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -1733,9 +1733,13 @@ public class Activity extends ContextThemeWrapper
      *
      * @param multiWindowMode True if the activity is in multi-window mode.
      */
+    @CallSuper
     public void onMultiWindowModeChanged(boolean multiWindowMode) {
         if (DEBUG_LIFECYCLE) Slog.v(TAG,
                 "onMultiWindowModeChanged " + this + ": " + multiWindowMode);
+        if (mWindow != null) {
+            mWindow.onMultiWindowModeChanged();
+        }
     }
 
     /**
diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index 53490b4e15e3..d7a98abdb271 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -2106,4 +2106,10 @@ public abstract class Window {
      * to better match your application.
      */
     public abstract void setResizingCaptionDrawable(Drawable drawable);
+
+    /**
+     * Called when the activity changes from fullscreen mode to multi-window mode and visa-versa.
+     * @hide
+     */
+    public abstract void onMultiWindowModeChanged();
 }