Commit 5f65e96e authored by stevenjb's avatar stevenjb Committed by Commit bot

Use md-select instead of paper-dropdown-menu-light in display.html

BUG=653689
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://chromiumcodereview.appspot.com/2427833002
Cr-Commit-Position: refs/heads/master@{#426544}
parent ba69ee85
...@@ -3,16 +3,15 @@ ...@@ -3,16 +3,15 @@
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.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-checkbox/paper-checkbox.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/paper-dropdown-menu-light.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-listbox.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slider.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slider.html">
<link rel="import" href="/device_page/display_layout.html"> <link rel="import" href="/device_page/display_layout.html">
<link rel="import" href="/device_page/display_overscan_dialog.html"> <link rel="import" href="/device_page/display_overscan_dialog.html">
<link rel="import" href="/md_select_css.html">
<link rel="import" href="/settings_shared_css.html"> <link rel="import" href="/settings_shared_css.html">
<dom-module id="settings-display"> <dom-module id="settings-display">
<template> <template>
<style include="settings-shared"> <style include="settings-shared md-select">
.settings-box.embedded { .settings-box.embedded {
align-self: stretch; align-self: stretch;
margin-left: 20px; margin-left: 20px;
...@@ -76,19 +75,16 @@ ...@@ -76,19 +75,16 @@
</div> </div>
<div class="settings-box embedded"> <div class="settings-box embedded">
<div class="start textarea">$i18n{displayOrientation}</div> <div class="start textarea">$i18n{displayOrientation}</div>
<paper-dropdown-menu-light vertical-align="auto" no-label-float> <div class="md-select-wrapper">
<paper-listbox class="dropdown-content" <select class="md-select" value="[[selectedDisplay.rotation]]"
selected="[[selectedDisplay.rotation]]" on-change="onOrientationChange_">
attr-for-selected="value" <option value="0">$i18n{displayOrientationStandard}</option>
on-iron-activate="onSetOrientation_"> <option value="90">90</option>
<button class="dropdown-item" role="option" value="0"> <option value="180">180</option>
$i18n{displayOrientationStandard} <option value="270">270</option>
</button> </select>
<button class="dropdown-item" role="option" value="90">90</button> <span class="md-select-underline"></span>
<button class="dropdown-item" role="option" value="180">180</button> </div>
<button class="dropdown-item" role="option" value="270">270</button>
</paper-listbox>
</paper-dropdown-menu-light>
</div> </div>
<div class="settings-box embedded" <div class="settings-box embedded"
hidden$="[[selectedDisplay.isInternal]]"> hidden$="[[selectedDisplay.isInternal]]">
......
...@@ -279,12 +279,13 @@ Polymer({ ...@@ -279,12 +279,13 @@ Polymer({
}, },
/** /**
* @param {!{detail: !{selected: string}}} e * @param {!Event} event
* @private * @private
*/ */
onSetOrientation_: function(e) { onOrientationChange_: function(event) {
let target = /** @type {!HTMLSelectElement} */ (event.target);
/** @type {!chrome.system.display.DisplayProperties} */ var properties = { /** @type {!chrome.system.display.DisplayProperties} */ var properties = {
rotation: parseInt(e.detail.selected, 10) rotation: parseInt(target.value, 10)
}; };
settings.display.systemDisplayApi.setDisplayProperties( settings.display.systemDisplayApi.setDisplayProperties(
this.selectedDisplay.id, properties, this.selectedDisplay.id, properties,
......
...@@ -476,7 +476,7 @@ cr.define('device_page_tests', function() { ...@@ -476,7 +476,7 @@ cr.define('device_page_tests', function() {
displayPage.displays[1].id, displayPage.selectedDisplay.id); displayPage.displays[1].id, displayPage.selectedDisplay.id);
displayPage.onMakePrimaryTap_(); displayPage.onMakePrimaryTap_();
displayPage.onSetOrientation_({detail: {selected: '90'}}); displayPage.onOrientationChange_({target: {value: '90'}});
fakeSystemDisplay.onDisplayChanged.callListeners(); fakeSystemDisplay.onDisplayChanged.callListeners();
return Promise.all([ return Promise.all([
......
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