diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/widget/PopupMenu.java | 13 | ||||
| -rw-r--r-- | core/java/com/android/internal/view/menu/MenuPopupHelper.java | 6 |
3 files changed, 19 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 2afabb1c2be2..aa8989d9e8da 100644 --- a/api/current.txt +++ b/api/current.txt @@ -56262,6 +56262,7 @@ package android.widget { method public android.view.Menu getMenu(); method public android.view.MenuInflater getMenuInflater(); method public void inflate(@MenuRes int); + method public void setForceShowIcon(boolean); method public void setGravity(int); method public void setOnDismissListener(android.widget.PopupMenu.OnDismissListener); method public void setOnMenuItemClickListener(android.widget.PopupMenu.OnMenuItemClickListener); diff --git a/core/java/android/widget/PopupMenu.java b/core/java/android/widget/PopupMenu.java index d82e56c94d2a..b0c0c12e907a 100644 --- a/core/java/android/widget/PopupMenu.java +++ b/core/java/android/widget/PopupMenu.java @@ -259,6 +259,19 @@ public class PopupMenu { } /** + * Sets whether the popup menu's adapter is forced to show icons in the + * menu item views. + * <p> + * Changes take effect on the next call to show(). + * + * @param forceShowIcon {@code true} to force icons to be shown, or + * {@code false} for icons to be optionally shown + */ + public void setForceShowIcon(boolean forceShowIcon) { + mPopup.setForceShowIcon(forceShowIcon); + } + + /** * Interface responsible for receiving menu item click events if the items * themselves do not have individual item click listeners. */ diff --git a/core/java/com/android/internal/view/menu/MenuPopupHelper.java b/core/java/com/android/internal/view/menu/MenuPopupHelper.java index e6d34600485c..64291de38130 100644 --- a/core/java/com/android/internal/view/menu/MenuPopupHelper.java +++ b/core/java/com/android/internal/view/menu/MenuPopupHelper.java @@ -26,6 +26,7 @@ import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.graphics.Point; import android.graphics.Rect; +import android.os.Build; import android.util.DisplayMetrics; import android.view.Display; import android.view.Gravity; @@ -107,10 +108,13 @@ public class MenuPopupHelper implements MenuHelper { * <p> * Changes take effect on the next call to show(). * + * This method should not be accessed directly outside the framework, please use + * {@link android.widget.PopupMenu#setForceShowIcon(boolean)} instead. + * * @param forceShowIcon {@code true} to force icons to be shown, or * {@code false} for icons to be optionally shown */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) public void setForceShowIcon(boolean forceShowIcon) { mForceShowIcon = forceShowIcon; if (mPopup != null) { |