Merge pull request #489 from naoliv/pull14

Fix duplicated branch
This commit is contained in:
vshcherb 2013-08-05 10:49:37 -07:00
commit c8d21ce85e

View file

@ -195,7 +195,7 @@ public class QuickAction extends CustomPopupWindow {
} else if (arrowPos > screenWidth/4 && arrowPos < 3 * (screenWidth/4)) { } else if (arrowPos > screenWidth/4 && arrowPos < 3 * (screenWidth/4)) {
window.setAnimationStyle((onTop) ? R.style.Animations_PopUpMenu_Center : R.style.Animations_PopDownMenu_Center); window.setAnimationStyle((onTop) ? R.style.Animations_PopUpMenu_Center : R.style.Animations_PopDownMenu_Center);
} else { } else {
window.setAnimationStyle((onTop) ? R.style.Animations_PopDownMenu_Right : R.style.Animations_PopDownMenu_Right); window.setAnimationStyle((onTop) ? R.style.Animations_PopUpMenu_Right : R.style.Animations_PopDownMenu_Right);
} }
break; break;