Commit 013e2b63 authored by Alexander Alekseev's avatar Alexander Alekseev Committed by Commit Bot

Chrome OS OOBE: add chromebox UI video, and switched all videos to 2x.

Bug: 873824
Change-Id: I2f205fdca015150805768ed7adf5d2ff31344927
Reviewed-on: https://chromium-review.googlesource.com/1174986Reviewed-by: default avatarWenzhao (Colin) Zang <wzang@chromium.org>
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583167}
parent 80b08e93
...@@ -28,6 +28,11 @@ ...@@ -28,6 +28,11 @@
user-select: none; user-select: none;
} }
video {
height: 200px;
width: 449px;
}
#buttons { #buttons {
width: 100%; width: 100%;
} }
...@@ -69,37 +69,45 @@ ...@@ -69,37 +69,45 @@
</div> </div>
<div class="welcome-illustration"> <div class="welcome-illustration">
<if expr="chromeos and _google_chrome"> <if expr="chromeos and _google_chrome">
<video muted hidden oobe_devices="chromebox"
oobe_orientations="portrait,landscape" oobe_types="intro"
src="../../../internal/resources/chromeos/animations/oobe-welcome/chromebox_intro_2x.webm">
</video>
<video muted loop hidden oobe_devices="chromebox"
oobe_orientations="portrait,landscape" oobe_types="loop"
src="../../../internal/resources/chromeos/animations/oobe-welcome/chromebox_loop_2x.webm">
</video>
<video muted hidden oobe_devices="laptop_G" <video muted hidden oobe_devices="laptop_G"
oobe_orientations="portrait,landscape" oobe_types="intro" oobe_orientations="portrait,landscape" oobe_types="intro"
src="../../../internal/resources/chromeos/animations/oobe-welcome/laptop_G_intro.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/laptop_G_intro_2x.webm">
</video> </video>
<video muted loop hidden oobe_devices="laptop_G" <video muted loop hidden oobe_devices="laptop_G"
oobe_orientations="portrait,landscape" oobe_types="loop" oobe_orientations="portrait,landscape" oobe_types="loop"
src="../../../internal/resources/chromeos/animations/oobe-welcome/laptop_G_loop.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/laptop_G_loop_2x.webm">
</video> </video>
<video muted hidden oobe_devices="laptop" <video muted hidden oobe_devices="laptop"
oobe_orientations="portrait,landscape" oobe_types="intro" oobe_orientations="portrait,landscape" oobe_types="intro"
src="../../../internal/resources/chromeos/animations/oobe-welcome/laptop_intro.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/laptop_intro_2x.webm">
</video> </video>
<video muted loop hidden oobe_devices="laptop" <video muted loop hidden oobe_devices="laptop"
oobe_orientations="portrait,landscape" oobe_types="loop" oobe_orientations="portrait,landscape" oobe_types="loop"
src="../../../internal/resources/chromeos/animations/oobe-welcome/laptop_loop.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/laptop_loop_2x.webm">
</video> </video>
<video muted hidden oobe_devices="tablet_G" <video muted hidden oobe_devices="tablet_G"
oobe_orientations="portrait,landscape" oobe_types="intro" oobe_orientations="portrait,landscape" oobe_types="intro"
src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_G_intro.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_G_intro_2x.webm">
</video> </video>
<video muted loop hidden oobe_devices="tablet_G" <video muted loop hidden oobe_devices="tablet_G"
oobe_orientations="portrait,landscape" oobe_types="loop" oobe_orientations="portrait,landscape" oobe_types="loop"
src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_G_loop.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_G_loop_2x.webm">
</video> </video>
<video muted hidden oobe_devices="tablet" <video muted hidden oobe_devices="tablet"
oobe_orientations="portrait,landscape" oobe_types="intro" oobe_orientations="portrait,landscape" oobe_types="intro"
src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_intro.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_intro_2x.webm">
</video> </video>
<video muted loop hidden oobe_devices="tablet" <video muted loop hidden oobe_devices="tablet"
oobe_orientations="portrait,landscape" oobe_types="loop" oobe_orientations="portrait,landscape" oobe_types="loop"
src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_loop.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_loop_2x.webm">
</video> </video>
</if> </if>
</div> </div>
......
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
}; };
const VIDEO_DEVICE = { const VIDEO_DEVICE = {
CHROMEBOX: 'chromebox',
LAPTOP: 'laptop', LAPTOP: 'laptop',
TABLET: 'tablet', TABLET: 'tablet',
LAPTOP_G: 'laptop_G', LAPTOP_G: 'laptop_G',
...@@ -266,6 +267,7 @@ ...@@ -266,6 +267,7 @@
timezoneButtonVisible: { timezoneButtonVisible: {
type: Boolean, type: Boolean,
value: false, value: false,
observer: 'updateVideoMode_',
}, },
/** /**
...@@ -274,7 +276,7 @@ ...@@ -274,7 +276,7 @@
debuggingLinkVisible: Boolean, debuggingLinkVisible: Boolean,
/** /**
* True when in tablet mode. * True when in tablet mode (vs laptop).
*/ */
isInTabletMode: { isInTabletMode: {
type: Boolean, type: Boolean,
...@@ -282,7 +284,7 @@ ...@@ -282,7 +284,7 @@
}, },
/** /**
* True when scree orientation is portrait. * True when screen orientation is portrait (vs landscape).
*/ */
isInPortraitMode: { isInPortraitMode: {
type: Boolean, type: Boolean,
...@@ -291,6 +293,9 @@ ...@@ -291,6 +293,9 @@
}, },
getVideoDeviceType_: function() { getVideoDeviceType_: function() {
if (this.timezoneButtonVisible)
return VIDEO_DEVICE.CHROMEBOX;
return this.isInTabletMode ? VIDEO_DEVICE.TABLET : VIDEO_DEVICE.LAPTOP; return this.isInTabletMode ? VIDEO_DEVICE.TABLET : VIDEO_DEVICE.LAPTOP;
}, },
...@@ -300,6 +305,11 @@ ...@@ -300,6 +305,11 @@
}, },
updateVideoMode_: function() { updateVideoMode_: function() {
// Depending on the order of events, this might be called before
// attached().
if (!this.welcomeVideoController_)
return;
this.welcomeVideoController_.updateConfiguration( this.welcomeVideoController_.updateConfiguration(
this.getVideoDeviceType_(), this.getVideoOrientationType_()); this.getVideoDeviceType_(), this.getVideoOrientationType_());
}, },
......
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