Merge "DO NOT MERGE Added check to make orientation calculations more robust" into honeycomb
diff --git a/core/java/android/animation/ObjectAnimator.java b/core/java/android/animation/ObjectAnimator.java
index 3a292cc..3212cba 100644
--- a/core/java/android/animation/ObjectAnimator.java
+++ b/core/java/android/animation/ObjectAnimator.java
@@ -29,7 +29,8 @@
* are then determined internally and the animation will call these functions as necessary to
* animate the property.
*
- * @note Instances of this class hold only a {@link WeakReference} to the target object.
+ * <p class="note"><b>Note:</b> Instances of this class hold only a {@link WeakReference}
+ * to the target object.</p>
* @see #setPropertyName(String)
*
*/
diff --git a/core/java/com/android/internal/view/menu/ActionMenuItemView.java b/core/java/com/android/internal/view/menu/ActionMenuItemView.java
index 7218ddc..3325df6 100644
--- a/core/java/com/android/internal/view/menu/ActionMenuItemView.java
+++ b/core/java/com/android/internal/view/menu/ActionMenuItemView.java
@@ -106,10 +106,11 @@
mImageButton.setImageDrawable(icon);
if (icon != null) {
mImageButton.setVisibility(VISIBLE);
- mTextButton.setVisibility(GONE);
} else {
mImageButton.setVisibility(GONE);
}
+
+ mTextButton.setVisibility(icon == null || mItemData.showsTextAsAction() ? VISIBLE : GONE);
}
public boolean hasText() {