Merge branch 'master' into 'master'

[Mobile] Add yield icon

See merge request core-developers/forge!3903

forge-gui-mobile/src/forge/assets/FSkinImage.java

@@ -132,6 +132,7 @@ public enum FSkinImage implements FImage {
     HDPREFERENCE (FSkinProp.ICO_HDPREFERENCE, SourceFile.BUTTONS),
     HDIMPORT     (FSkinProp.ICO_HDIMPORT, SourceFile.BUTTONS),
     HDEXPORT     (FSkinProp.ICO_HDEXPORT, SourceFile.BUTTONS),
+    HDYIELD      (FSkinProp.ICO_HDYIELD, SourceFile.BUTTONS),
     BLANK        (FSkinProp.ICO_BLANK, SourceFile.ICONS),
 
     //Achievement Trophies

forge-gui-mobile/src/forge/screens/match/views/VGameMenu.java

@@ -67,7 +67,7 @@ public class VGameMenu extends FDropDownMenu {
                 FOptionPane.showMessageDialog(localizer.getMessage("lblNoPlayerPriorityNoDeckListViewed"));
             }
         }));
-        addItem(new FMenuItem(localizer.getMessage("lblAutoYields"), FSkinImage.WARNING, new FEventHandler() {
+        addItem(new FMenuItem(localizer.getMessage("lblAutoYields"), Forge.hdbuttons ? FSkinImage.HDYIELD : FSkinImage.WARNING, new FEventHandler() {
             @Override
             public void handleEvent(FEvent e) {
                 final boolean autoYieldsDisabled = MatchController.instance.getDisableAutoYields();

forge-gui/src/main/java/forge/assets/FSkinProp.java

@@ -188,6 +188,7 @@ public enum FSkinProp {
     ICO_HDPREFERENCE (new int[] {262, 1792, 128, 128}, PropType.BUTTONS),
     ICO_HDIMPORT     (new int[] {2, 1922, 128, 128}, PropType.BUTTONS),
     ICO_HDEXPORT     (new int[] {132, 1922, 128, 128}, PropType.BUTTONS),
+    ICO_HDYIELD      (new int[] {262, 1922, 128, 128}, PropType.BUTTONS),
     ICO_BLANK        (new int[] {2, 2, 2, 2}, PropType.ICON), //safe coords, lower than 2 will cause crash on desktop
     IMG_LANDLOGO     (new int[] {84, 822, 80, 80}, PropType.MANAICONS),