Moving the dismissal call to prevent an inevitable merge fail

This commit is contained in:
TwistedUmbrella 2014-02-13 02:41:29 -05:00
parent 60d3521d47
commit c3a7260dc1
1 changed files with 9 additions and 9 deletions

View File

@ -295,6 +295,15 @@ public class OnScreenMenu {
frames_up.setEnabled(true);
}
}
public void dismissPopUps() {
for (PopupWindow popup : popups) {
if (popup.isShowing()) {
popup.dismiss();
popups.remove(popup);
}
}
}
public static int getPixelsFromDp(float dps, Context context) {
return (int) (dps * context.getResources().getDisplayMetrics().density + 0.5f);
@ -309,13 +318,4 @@ public class OnScreenMenu {
return but;
}
public void dismissPopUps() {
for (PopupWindow popup : popups) {
if (popup.isShowing()) {
popup.dismiss();
popups.remove(popup);
}
}
}
}