diff options
| author | Adam Powell <adamp@google.com> | 2011-04-22 16:05:17 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2011-04-22 16:05:17 -0700 |
| commit | d0f650c6c3a123c856bb0adb138ae7cd0deed3d1 (patch) | |
| tree | 4dd0b07887ee547fbec49356d1e73fd00759d390 /core/java | |
| parent | 46eb6de85a6b4144f92890d632816156e151ad15 (diff) | |
| download | frameworks_base-d0f650c6c3a123c856bb0adb138ae7cd0deed3d1.zip frameworks_base-d0f650c6c3a123c856bb0adb138ae7cd0deed3d1.tar.gz frameworks_base-d0f650c6c3a123c856bb0adb138ae7cd0deed3d1.tar.bz2 | |
Fix mipmap selection for action bar icons
Change-Id: I6d34dabb5289284fd5821695ad14d8bdeb97e50d
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index 587d678..fa8eb51 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -457,11 +457,11 @@ public class ActionBarView extends ViewGroup { mIconView.getPaddingTop() - mIconView.getPaddingBottom(); int iconSize = res.getDimensionPixelSize(android.R.dimen.app_icon_size); - if (iconSize * DisplayMetrics.DENSITY_LOW > availableHeight) { + if (iconSize * DisplayMetrics.DENSITY_LOW >= availableHeight) { return DisplayMetrics.DENSITY_LOW; - } else if (iconSize * DisplayMetrics.DENSITY_MEDIUM > availableHeight) { + } else if (iconSize * DisplayMetrics.DENSITY_MEDIUM >= availableHeight) { return DisplayMetrics.DENSITY_MEDIUM; - } else if (iconSize * DisplayMetrics.DENSITY_HIGH > availableHeight) { + } else if (iconSize * DisplayMetrics.DENSITY_HIGH >= availableHeight) { return DisplayMetrics.DENSITY_HIGH; } return DisplayMetrics.DENSITY_XHIGH; |