Commit 2ef63fa6 authored by dpapad's avatar dpapad Committed by Commit Bot

WebUI cleanup: Remove neon-animation usage from device-emulator.

This is in preparation of fully removing neon-animation from the repository
(although there is a long way to get there).

Bug: 902959
Change-Id: Ia1444651b96fba4316f69cfeb65bf92177acb389
Reviewed-on: https://chromium-review.googlesource.com/c/1324993Reviewed-by: default avatarScott Chen <scottchen@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606634}
parent 38e1e0a8
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<link rel="import" href="chrome://resources/cr_elements/cr_radio_group/cr_radio_group.html"> <link rel="import" href="chrome://resources/cr_elements/cr_radio_group/cr_radio_group.html">
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html"> <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable-behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
<link rel="import" href="icons.html"> <link rel="import" href="icons.html">
......
...@@ -49,8 +49,6 @@ var AudioNode = function() { ...@@ -49,8 +49,6 @@ var AudioNode = function() {
Polymer({ Polymer({
is: 'audio-settings', is: 'audio-settings',
behaviors: [Polymer.NeonAnimatableBehavior],
properties: { properties: {
/** /**
* An AudioNode which is currently being edited. * An AudioNode which is currently being edited.
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
<link rel="import" href="chrome://resources/html/md_select_css.html"> <link rel="import" href="chrome://resources/html/md_select_css.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable-behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
<link rel="import" href="icons.html"> <link rel="import" href="icons.html">
<link rel="import" href="shared_styles.html"> <link rel="import" href="shared_styles.html">
......
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
var BatterySettings = Polymer({ var BatterySettings = Polymer({
is: 'battery-settings', is: 'battery-settings',
behaviors: [Polymer.NeonAnimatableBehavior],
properties: { properties: {
/** The system's battery percentage. */ /** The system's battery percentage. */
batteryPercent: Number, batteryPercent: Number,
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<link rel="import" href="chrome://resources/cr_elements/cr_radio_group/cr_radio_group.html"> <link rel="import" href="chrome://resources/cr_elements/cr_radio_group/cr_radio_group.html">
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html"> <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable-behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
<link rel="import" href="icons.html"> <link rel="import" href="icons.html">
......
...@@ -54,8 +54,6 @@ var BluetoothDevice = function() { ...@@ -54,8 +54,6 @@ var BluetoothDevice = function() {
Polymer({ Polymer({
is: 'bluetooth-settings', is: 'bluetooth-settings',
behaviors: [Polymer.NeonAnimatableBehavior],
properties: { properties: {
/** /**
* A set of bluetooth devices. * A set of bluetooth devices.
......
...@@ -6,10 +6,7 @@ ...@@ -6,10 +6,7 @@
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-selector.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-selector.html">
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animated-pages.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.html">
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/fade-in-animation.html">
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/fade-out-animation.html">
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/web-animations.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/shadow.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/shadow.html">
<link rel="import" href="audio_settings.html"> <link rel="import" href="audio_settings.html">
<link rel="import" href="battery_settings.html"> <link rel="import" href="battery_settings.html">
...@@ -28,12 +25,12 @@ ...@@ -28,12 +25,12 @@
flex-direction: column; flex-direction: column;
} }
neon-animated-pages { iron-pages {
max-width: 70%; max-width: 70%;
min-width: 70%; min-width: 70%;
} }
neon-animated-pages > * { iron-pages > * {
@apply(--shadow-elevation-2dp); @apply(--shadow-elevation-2dp);
background-color: white; background-color: white;
display: block; display: block;
...@@ -103,15 +100,12 @@ ...@@ -103,15 +100,12 @@
</div> </div>
</cr-drawer> </cr-drawer>
<div id="container" class="no-outline"> <div id="container" class="no-outline">
<neon-animated-pages selected="[[selectedPage]]" <iron-pages selected="[[selectedPage]]">
entry-animation="fade-in-animation"
exit-animation="fade-out-animation">
<audio-settings id="audioSettings"></audio-settings> <audio-settings id="audioSettings"></audio-settings>
<battery-settings id="batterySettings"></battery-settings> <battery-settings id="batterySettings"></battery-settings>
<bluetooth-settings id="bluetoothSettings"></bluetooth-settings> <bluetooth-settings id="bluetoothSettings"></bluetooth-settings>
<input-device-settings id="inputDeviceSettings"> <input-device-settings id="inputDeviceSettings"></input-device-settings>
</input-device-settings> </iron-pages>
</neon-animated-pages>
</div> </div>
</template> </template>
<script src="device_emulator_pages.js"></script> <script src="device_emulator_pages.js"></script>
......
...@@ -21,7 +21,7 @@ Polymer({ ...@@ -21,7 +21,7 @@ Polymer({
/** @override */ /** @override */
ready: function() { ready: function() {
for (var page of Polymer.dom(this.$$('neon-animated-pages')).children) for (const page of this.$$('iron-pages').children)
device_emulator[page.id] = page; device_emulator[page.id] = page;
chrome.send('initializeDeviceEmulator'); chrome.send('initializeDeviceEmulator');
......
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
Polymer({ Polymer({
is: 'input-device-settings', is: 'input-device-settings',
behaviors: [Polymer.NeonAnimatableBehavior],
/** /**
* @param {!Event} e * @param {!Event} e
* Callback when the user toggles the touchpad. * Callback when the user toggles the touchpad.
......
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