Commit 5c47d39f authored by Jesse Schettler's avatar Jesse Schettler Committed by Commit Bot

scanning: Change default file type to PNG

Until PDF is supported, set PNG as the default file type.

Bug: 1059779
Change-Id: I6675e6526de668d8cafb1152baeb94ed37e7f13c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2506111
Auto-Submit: Jesse Schettler <jschettler@chromium.org>
Reviewed-by: default avatarJimmy Gong <jimmyxgong@chromium.org>
Commit-Queue: Jesse Schettler <jschettler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821885}
parent e25126d7
...@@ -262,7 +262,7 @@ suite('ScanningAppTest', () => { ...@@ -262,7 +262,7 @@ suite('ScanningAppTest', () => {
tokenToString(firstScannerId), scanningApp.selectedScannerId); tokenToString(firstScannerId), scanningApp.selectedScannerId);
assertEquals( assertEquals(
firstCapabilities.sources[0].name, scanningApp.selectedSource); firstCapabilities.sources[0].name, scanningApp.selectedSource);
assertEquals(FileType.PDF.toString(), scanningApp.selectedFileType); assertEquals(FileType.PNG.toString(), scanningApp.selectedFileType);
assertEquals( assertEquals(
firstCapabilities.colorModes[0].toString(), firstCapabilities.colorModes[0].toString(),
scanningApp.selectedColorMode); scanningApp.selectedColorMode);
...@@ -515,7 +515,7 @@ suite('FileTypeSelectTest', () => { ...@@ -515,7 +515,7 @@ suite('FileTypeSelectTest', () => {
test('initializeFileTypeSelect', () => { test('initializeFileTypeSelect', () => {
// The dropdown should be initialized as enabled with three options. The // The dropdown should be initialized as enabled with three options. The
// default option should be PDF. // default option should be PNG.
const select = fileTypeSelect.$$('select'); const select = fileTypeSelect.$$('select');
assertTrue(!!select); assertTrue(!!select);
assertFalse(select.disabled); assertFalse(select.disabled);
...@@ -523,7 +523,7 @@ suite('FileTypeSelectTest', () => { ...@@ -523,7 +523,7 @@ suite('FileTypeSelectTest', () => {
assertEquals('JPG', select.options[0].textContent.trim()); assertEquals('JPG', select.options[0].textContent.trim());
assertEquals('PDF', select.options[1].textContent.trim()); assertEquals('PDF', select.options[1].textContent.trim());
assertEquals('PNG', select.options[2].textContent.trim()); assertEquals('PNG', select.options[2].textContent.trim());
assertEquals(FileType.PDF.toString(), select.value); assertEquals(FileType.PNG.toString(), select.value);
// Selecting a different option should update the selected value. // Selecting a different option should update the selected value.
select.value = FileType.JPG.toString(); select.value = FileType.JPG.toString();
......
...@@ -7,9 +7,10 @@ ...@@ -7,9 +7,10 @@
disabled="[[disabled]]"> disabled="[[disabled]]">
<!-- The option values must match the chromeos.scanning.mojom.FileType <!-- The option values must match the chromeos.scanning.mojom.FileType
values they correspond to. --> values they correspond to. -->
<!-- TODO(jschettler): Change default back to PDF when it's supported. -->
<option value="0">[[i18n('jpgOptionText')]]</option> <option value="0">[[i18n('jpgOptionText')]]</option>
<option value="1" selected>[[i18n('pdfOptionText')]]</option> <option value="1">[[i18n('pdfOptionText')]]</option>
<option value="2">[[i18n('pngOptionText')]]</option> <option value="2" selected>[[i18n('pngOptionText')]]</option>
</select> </select>
</div> </div>
</scan-settings-section> </scan-settings-section>
...@@ -154,8 +154,9 @@ Polymer({ ...@@ -154,8 +154,9 @@ Polymer({
this.capabilities_.sources[0].pageSizes[0].toString(); this.capabilities_.sources[0].pageSizes[0].toString();
this.selectedResolution = this.capabilities_.resolutions[0].toString(); this.selectedResolution = this.capabilities_.resolutions[0].toString();
// PDF is the default file type. // TODO(jschettler): Change default file type back to PDF when it's
this.selectedFileType = chromeos.scanning.mojom.FileType.kPdf.toString(); // supported.
this.selectedFileType = chromeos.scanning.mojom.FileType.kPng.toString();
this.scanButtonDisabled_ = false; this.scanButtonDisabled_ = false;
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment