Commit 6860ea24 authored by David Reveman's avatar David Reveman Committed by Commit Bot

Change Picture: Re-enable motion stills.

This turns motion stills back on. The feature is currently
considered ready to be enabled by default. A command line switch
can be added as a follow up if we determine that this is not
ready yet.

Bug: 769140
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I0e180cece59aed3356331be8609616ffaab0d35c
Reviewed-on: https://chromium-review.googlesource.com/749529Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: David Reveman <reveman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#513285}
parent 0e206468
...@@ -49,7 +49,8 @@ ...@@ -49,7 +49,8 @@
image-type="[[getImageType_(selectedItem_)]]" image-type="[[getImageType_(selectedItem_)]]"
discard-image-label="[[i18nDynamic(locale, 'discardPhoto')]]" discard-image-label="[[i18nDynamic(locale, 'discardPhoto')]]"
take-photo-label="[[i18nDynamic(locale, 'takePhoto')]]" take-photo-label="[[i18nDynamic(locale, 'takePhoto')]]"
switch-mode-label="[[i18nDynamic(locale, 'switchMode')]]"> switch-mode-label="[[i18nDynamic(locale, 'switchMode')]]"
camera-video-mode-enabled="[[cameraVideoModeEnabled]]">
</cr-picture-pane> </cr-picture-pane>
<cr-picture-list id="pictureList" <cr-picture-list id="pictureList"
camera-present="[[cameraPresent]]" camera-present="[[cameraPresent]]"
......
...@@ -62,6 +62,15 @@ Polymer({ ...@@ -62,6 +62,15 @@ Polymer({
*/ */
firstDefaultImageIndex: Number, firstDefaultImageIndex: Number,
/**
* True when camera video mode is enabled.
* @private {boolean}
*/
cameraVideoModeEnabled: {
type: Boolean,
value: true,
},
/** /**
* The currently selected item. This property is bound to the iron-selector * The currently selected item. This property is bound to the iron-selector
* and never directly assigned. This may be undefined momentarily as * and never directly assigned. This may be undefined momentarily as
......
...@@ -84,7 +84,8 @@ ...@@ -84,7 +84,8 @@
discard-image-label="$i18n{discardPhoto}" discard-image-label="$i18n{discardPhoto}"
preview-alt-text="$i18n{previewAltText}" preview-alt-text="$i18n{previewAltText}"
take-photo-label="$i18n{takePhoto}" take-photo-label="$i18n{takePhoto}"
switch-mode-label="$i18n{switchMode}"> switch-mode-label="$i18n{switchMode}"
camera-video-mode-enabled="[[cameraVideoModeEnabled_]]">
</cr-picture-pane> </cr-picture-pane>
<div id="authorCredit" <div id="authorCredit"
hidden="[[!isAuthorCreditShown_(selectedItem_)]]"> hidden="[[!isAuthorCreditShown_(selectedItem_)]]">
......
...@@ -53,6 +53,15 @@ Polymer({ ...@@ -53,6 +53,15 @@ Polymer({
* @private * @private
*/ */
firstDefaultImageIndex_: Number, firstDefaultImageIndex_: Number,
/**
* True when camera video mode is enabled.
* @private {boolean}
*/
cameraVideoModeEnabled_: {
type: Boolean,
value: true,
},
}, },
listeners: { listeners: {
......
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
<div> <div>
<button is="paper-icon-button-light" id="switchMode" tabindex="2" <button is="paper-icon-button-light" id="switchMode" tabindex="2"
title="[[switchModeLabel]]" on-tap="onTapSwitchMode_" title="[[switchModeLabel]]" on-tap="onTapSwitchMode_"
disabled="[[!cameraOnline_]]" hidden="[[!videomodeEnabled]]"> disabled="[[!cameraOnline_]]" hidden="[[!videoModeEnabled]]">
</button> </button>
</div> </div>
</div> </div>
......
...@@ -38,7 +38,7 @@ Polymer({ ...@@ -38,7 +38,7 @@ Polymer({
switchModeLabel: String, switchModeLabel: String,
/** True if video mode is enabled. */ /** True if video mode is enabled. */
videomodeEnabled: { videoModeEnabled: {
type: Boolean, type: Boolean,
value: false, value: false,
}, },
......
...@@ -76,7 +76,8 @@ ...@@ -76,7 +76,8 @@
<template is="dom-if" if="[[cameraActive_]]"> <template is="dom-if" if="[[cameraActive_]]">
<cr-camera id="camera" <cr-camera id="camera"
take-photo-label="[[takePhotoLabel]]" take-photo-label="[[takePhotoLabel]]"
switch-mode-label="[[switchModeLabel]]"> switch-mode-label="[[switchModeLabel]]"
video-mode-enabled="[[cameraVideoModeEnabled]]">
</cr-camera> </cr-camera>
</template> </template>
</template> </template>
......
...@@ -45,6 +45,9 @@ Polymer({ ...@@ -45,6 +45,9 @@ Polymer({
takePhotoLabel: String, takePhotoLabel: String,
switchModeLabel: String, switchModeLabel: String,
/** Whether camera video mode is enabled */
cameraVideoModeEnabled: Boolean,
/** Whether the camera should be shown and active (started). */ /** Whether the camera should be shown and active (started). */
cameraActive_: { cameraActive_: {
type: Boolean, type: Boolean,
......
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