Merge "Revert "Showing default activity in activity chooser view only if enough space."" into jb-dev

3 files changed, 10 insertions, 49 deletions

diff --git a/core/java/android/widget/ActivityChooserModel.java b/core/java/android/widget/ActivityChooserModel.java
index c6104bce0ea9..fe6c4f5477ac 100644
--- a/core/java/android/widget/ActivityChooserModel.java
+++ b/core/java/android/widget/ActivityChooserModel.java
@@ -765,16 +765,6 @@ public class ActivityChooserModel extends DataSetObservable {
     }
 
     /**
-     * Gets whether the given observer is already registered.
-     *
-     * @param observer The observer.
-     * @return True if already registered.
-     */
-    public boolean isRegisteredObserver(DataSetObserver observer) {
-        return mObservers.contains(observer);
-    }
-
-    /**
      * Represents a record in the history.
      */
     public final static class HistoricalRecord {
diff --git a/core/java/android/widget/ActivityChooserView.java b/core/java/android/widget/ActivityChooserView.java
index 0c0bb1ed5d66..be6b4e2f5c76 100644
--- a/core/java/android/widget/ActivityChooserView.java
+++ b/core/java/android/widget/ActivityChooserView.java
@@ -20,10 +20,8 @@ import com.android.internal.R;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.database.DataSetObserver;
@@ -176,11 +174,6 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
     private int mDefaultActionButtonContentDescription;
 
     /**
-     * Whether this view has a default activity affordance.
-     */
-    private boolean mHasDefaultActivity;
-
-    /**
      * Create a new instance.
      *
      * @param context The application environment.
@@ -252,8 +245,6 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
         Resources resources = context.getResources();
         mListPopupMaxWidth = Math.max(resources.getDisplayMetrics().widthPixels / 2,
               resources.getDimensionPixelSize(com.android.internal.R.dimen.config_prefDialogWidth));
-
-        updateHasDefaultActivity();
     }
 
     /**
@@ -267,21 +258,6 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
         }
     }
 
-    @Override
-    protected void onConfigurationChanged(Configuration newConfig) {
-        Configuration oldConfig = mContext.getResources().getConfiguration();
-        final int changed = oldConfig.diff(newConfig);
-        if ((changed & ActivityInfo.CONFIG_SCREEN_SIZE) != 0
-                || (changed & ActivityInfo.CONFIG_ORIENTATION) != 0) {
-            updateHasDefaultActivity();
-        }
-    }
-
-    private void updateHasDefaultActivity() {
-        mHasDefaultActivity = mContext.getResources().getBoolean(
-                R.bool.activity_chooser_view_has_default_activity);
-    }
-
     /**
      * Sets the background for the button that expands the activity
      * overflow list.
@@ -407,8 +383,7 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
         ActivityChooserModel dataModel = mAdapter.getDataModel();
-        if (dataModel != null
-                && !dataModel.isRegisteredObserver(mModelDataSetOberver)) {
+        if (dataModel != null) {
             dataModel.registerObserver(mModelDataSetOberver);
         }
         mIsAttachedToWindow = true;
@@ -418,8 +393,7 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         ActivityChooserModel dataModel = mAdapter.getDataModel();
-        if (dataModel != null
-                && dataModel.isRegisteredObserver(mModelDataSetOberver)) {
+        if (dataModel != null) {
             dataModel.unregisterObserver(mModelDataSetOberver);
         }
         ViewTreeObserver viewTreeObserver = getViewTreeObserver();
@@ -522,7 +496,7 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
         // Default activity button.
         final int activityCount = mAdapter.getActivityCount();
         final int historySize = mAdapter.getHistorySize();
-        if (mHasDefaultActivity && activityCount > 0 && historySize > 0) {
+        if (activityCount > 0 && historySize > 0) {
             mDefaultActivityButton.setVisibility(VISIBLE);
             ResolveInfo activity = mAdapter.getDefaultActivity();
             PackageManager packageManager = mContext.getPackageManager();
@@ -538,9 +512,9 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
         }
         // Activity chooser content.
         if (mDefaultActivityButton.getVisibility() == VISIBLE) {
-            mActivityChooserContent.setBackground(mActivityChooserContentBackground);
+            mActivityChooserContent.setBackgroundDrawable(mActivityChooserContentBackground);
         } else {
-            mActivityChooserContent.setBackground(null);
+            mActivityChooserContent.setBackgroundDrawable(null);
         }
     }
 
@@ -603,7 +577,7 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
         // OnLongClickListener#onLongClick
         @Override
         public boolean onLongClick(View view) {
-            if (mHasDefaultActivity && view == mDefaultActivityButton) {
+            if (view == mDefaultActivityButton) {
                 if (mAdapter.getCount() > 0) {
                     mIsSelectingDefaultActivity = true;
                     showPopupUnchecked(mInitialActivityCount);
@@ -656,16 +630,14 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
 
         public void setDataModel(ActivityChooserModel dataModel) {
             ActivityChooserModel oldDataModel = mAdapter.getDataModel();
-            if (oldDataModel != null) {
+            if (oldDataModel != null && isShown()) {
                 oldDataModel.unregisterObserver(mModelDataSetOberver);
             }
             mDataModel = dataModel;
-            if (dataModel != null) {
+            if (dataModel != null && isShown()) {
                 dataModel.registerObserver(mModelDataSetOberver);
-                notifyDataSetChanged();
-            } else {
-                notifyDataSetInvalidated();
             }
+            notifyDataSetChanged();
         }
 
         @Override
diff --git a/core/java/android/widget/ShareActionProvider.java b/core/java/android/widget/ShareActionProvider.java
index 21840ca519ee..4045497dcc43 100644
--- a/core/java/android/widget/ShareActionProvider.java
+++ b/core/java/android/widget/ShareActionProvider.java
@@ -44,7 +44,6 @@ import com.android.internal.R;
  * <code>
  *  // In Activity#onCreateOptionsMenu
  *  public boolean onCreateOptionsMenu(Menu menu) {
- *      getManuInflater().inflate(R.menu.my_menu, menu);
  *      // Get the menu item.
  *      MenuItem menuItem = menu.findItem(R.id.my_menu_item);
  *      // Get the provider and hold onto it to set/change the share intent.
@@ -246,7 +245,7 @@ public class ShareActionProvider extends ActionProvider {
      * call {@link android.app.Activity#invalidateOptionsMenu()} to recreate the
      * action view. You should <strong>not</strong> call
      * {@link android.app.Activity#invalidateOptionsMenu()} from
-     * {@link android.app.Activity#onCreateOptionsMenu(Menu)}.
+     * {@link android.app.Activity#onCreateOptionsMenu(Menu)}."
      * <p>
      * <code>
      * private void doShare(Intent intent) {