Fix bug 2948913 - provide lifecycle notifications for action modes

Change-Id: I432e29a7bddb18bc32dfbe21a8ecd7d83158e3a0

1 files changed, 5 insertions, 1 deletions

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index 3dd6510..bb39c8f 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -1832,7 +1832,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
             }
 
             final ActionMode.Callback wrappedCallback = new ActionModeCallbackWrapper(callback);
-            ActionMode mode = getCallback().onStartActionMode(wrappedCallback);
+            ActionMode mode = getCallback().onWindowStartingActionMode(wrappedCallback);
             if (mode != null) {
                 mActionMode = mode;
             } else {
@@ -1876,6 +1876,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
                     }
                 }
             }
+            if (mActionMode != null) {
+                getCallback().onActionModeStarted(mActionMode);
+            }
             return mActionMode;
         }
 
@@ -2091,6 +2094,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
                 if (mActionModeView != null) {
                     mActionModeView.removeAllViews();
                 }
+                getCallback().onActionModeFinished(mActionMode);
                 mActionMode = null;
             }
         }