|
41 | 41 | import com.smartdevicelink.managers.CompletionListener; |
42 | 42 | import com.smartdevicelink.managers.ISdl; |
43 | 43 | import com.smartdevicelink.managers.ManagerUtility; |
| 44 | +import static com.smartdevicelink.managers.ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName; |
| 45 | +import static com.smartdevicelink.managers.ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName; |
44 | 46 | import com.smartdevicelink.managers.file.FileManager; |
45 | 47 | import com.smartdevicelink.managers.file.MultipleFileCompletionListener; |
46 | 48 | import com.smartdevicelink.managers.file.filetypes.SdlArtwork; |
|
74 | 76 | import java.lang.ref.WeakReference; |
75 | 77 | import java.util.ArrayList; |
76 | 78 | import java.util.Collections; |
77 | | -import java.util.Comparator; |
78 | 79 | import java.util.HashMap; |
79 | 80 | import java.util.HashSet; |
80 | 81 | import java.util.LinkedHashSet; |
81 | 82 | import java.util.List; |
82 | 83 | import java.util.Map; |
83 | | -import java.util.stream.Collectors; |
84 | 84 |
|
85 | 85 | class PreloadPresentChoicesOperation extends Task { |
86 | 86 |
|
@@ -771,23 +771,23 @@ boolean shouldSendChoiceText() { |
771 | 771 | if (this.displayName != null && this.displayName.equals(DisplayType.GEN3_8_INCH.toString())) { |
772 | 772 | return true; |
773 | 773 | } |
774 | | - return defaultMainWindowCapability == null || ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(defaultMainWindowCapability, TextFieldName.menuName); |
| 774 | + return defaultMainWindowCapability == null || hasTextFieldOfName(defaultMainWindowCapability, TextFieldName.menuName); |
775 | 775 | } |
776 | 776 |
|
777 | 777 | boolean shouldSendChoiceSecondaryText() { |
778 | | - return defaultMainWindowCapability == null || ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(defaultMainWindowCapability, TextFieldName.secondaryText); |
| 778 | + return defaultMainWindowCapability == null || hasTextFieldOfName(defaultMainWindowCapability, TextFieldName.secondaryText); |
779 | 779 | } |
780 | 780 |
|
781 | 781 | boolean shouldSendChoiceTertiaryText() { |
782 | | - return defaultMainWindowCapability == null || ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(defaultMainWindowCapability, TextFieldName.tertiaryText); |
| 782 | + return defaultMainWindowCapability == null || hasTextFieldOfName(defaultMainWindowCapability, TextFieldName.tertiaryText); |
783 | 783 | } |
784 | 784 |
|
785 | 785 | boolean shouldSendChoicePrimaryImage() { |
786 | | - return defaultMainWindowCapability == null || ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(defaultMainWindowCapability, ImageFieldName.choiceImage); |
| 786 | + return defaultMainWindowCapability == null || hasImageFieldOfName(defaultMainWindowCapability, ImageFieldName.choiceImage); |
787 | 787 | } |
788 | 788 |
|
789 | 789 | boolean shouldSendChoiceSecondaryImage() { |
790 | | - return defaultMainWindowCapability == null || ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(defaultMainWindowCapability, ImageFieldName.choiceSecondaryImage); |
| 790 | + return defaultMainWindowCapability == null || hasImageFieldOfName(defaultMainWindowCapability, ImageFieldName.choiceSecondaryImage); |
791 | 791 | } |
792 | 792 |
|
793 | 793 | // SDL Notifications |
|
0 commit comments