Adding a callback to ShareActionProvider + make ActivityChooserView popup hide on action bar hide.

1. Added a callback to ShareActionProvider allowing clients to be notified
   when an activity is chosed given them a change to say update their UI and
   also decide whether to handle the activity launch themselves.

2. The popup of the ActivityChooserView was not hiding on hiding the action bar.

bug:5094963
bug:5095004

Change-Id: I6c8e8cc1f22d07e707e2218eb108f9101417b23b

1 files changed, 32 insertions, 3 deletions

diff --git a/core/java/android/widget/ActivityChooserView.java b/core/java/android/widget/ActivityChooserView.java
index 45d73af58869..556414c9091b 100644
--- a/core/java/android/widget/ActivityChooserView.java
+++ b/core/java/android/widget/ActivityChooserView.java
@@ -29,6 +29,8 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.widget.ActivityChooserModel.ActivityChooserModelClient;
 
 import com.android.internal.R;
@@ -115,6 +117,19 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
         }
     };
 
+    private final OnGlobalLayoutListener mOnGlobalLayoutListener = new OnGlobalLayoutListener() {
+        @Override
+        public void onGlobalLayout() {
+            if (isShowingPopup()) {
+                if (!isShown()) {
+                    getListPopupWindow().dismiss();
+                } else {
+                    getListPopupWindow().show();
+                }
+            }
+        }
+    };
+
     /**
      * Popup window for showing the activity overflow list.
      */
@@ -261,6 +276,8 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
             throw new IllegalStateException("No data model. Did you call #setDataModel?");
         }
 
+        getViewTreeObserver().addOnGlobalLayoutListener(mOnGlobalLayoutListener);
+
         mAdapter.setMaxActivityCount(maxActivityCount);
 
         final int activityCount = mAdapter.getActivityCount();
@@ -292,6 +309,10 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
     public boolean dismissPopup() {
         if (isShowingPopup()) {
             getListPopupWindow().dismiss();
+            ViewTreeObserver viewTreeObserver = getViewTreeObserver();
+            if (viewTreeObserver.isAlive()) {
+                viewTreeObserver.removeGlobalOnLayoutListener(mOnGlobalLayoutListener);
+            }
         }
         return true;
     }
@@ -322,6 +343,10 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
         if (dataModel != null) {
             dataModel.unregisterObserver(mModelDataSetOberver);
         }
+        ViewTreeObserver viewTreeObserver = getViewTreeObserver();
+        if (viewTreeObserver.isAlive()) {
+            viewTreeObserver.removeGlobalOnLayoutListener(mOnGlobalLayoutListener);
+        }
         mIsAttachedToWindow = false;
     }
 
@@ -433,8 +458,10 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
                         }
                     } else {
                         // The first item in the model is default action => adjust index
-                        Intent launchIntent = mAdapter.getDataModel().chooseActivity(position + 1);
-                        mContext.startActivity(launchIntent);
+                        Intent launchIntent  = mAdapter.getDataModel().chooseActivity(position + 1);
+                        if (launchIntent != null) {
+                            mContext.startActivity(launchIntent);
+                        }
                     }
                 } break;
                 default:
@@ -449,7 +476,9 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
                 ResolveInfo defaultActivity = mAdapter.getDefaultActivity();
                 final int index = mAdapter.getDataModel().getActivityIndex(defaultActivity);
                 Intent launchIntent = mAdapter.getDataModel().chooseActivity(index);
-                mContext.startActivity(launchIntent);
+                if (launchIntent != null) {
+                    mContext.startActivity(launchIntent);
+                }
             } else if (view == mExpandActivityOverflowButton) {
                 mIsSelectingDefaultActivity = false;
                 showPopupUnchecked(mInitialActivityCount);