chrome/browser/resources/settings/device_page/device_page.html - Issue 1753653002: MD Settings: First half of Device > Keyboard sub-page.

Side by Side Diff: chrome/browser/resources/settings/device_page/device_page.html

Issue 1753653002: MD Settings: First half of Device > Keyboard sub-page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: missed one Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/resources/settings/device_page/compiled_resources2.gyp ('k') | chrome/browser/resources/settings/device_page/device_page.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
	1 <link rel="import" href="chrome://resources/html/polymer_config.html">

1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">	2 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">

2 <link rel="import" href="chrome://resources/html/i18n_behavior.html">

3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">	3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">

4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/hardware-ico ns.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/hardware-ico ns.html">

5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/image-icons. html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/image-icons. html">

6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">	6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">

	7 <link rel="import" href="chrome://resources/html/i18n_behavior.html">

	8 <link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.ht ml">

	9 <link rel="import" href="chrome://md-settings/device_page/keyboard.html">

7 <link rel="import" href="chrome://md-settings/device_page/touchpad.html">	10 <link rel="import" href="chrome://md-settings/device_page/touchpad.html">

	11 <link rel="import" href="chrome://md-settings/i18n_setup.html">

	12 <link rel="import" href="chrome://md-settings/prefs/prefs.html">

8 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">	13 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">

9 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">	14 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">

10 <link rel="import" href="chrome://md-settings/settings_shared_css.html">	15 <link rel="import" href="chrome://md-settings/settings_shared_css.html">

11	16

12 <dom-module id="settings-device-page">	17 <dom-module id="settings-device-page">

13 <template>	18 <template>

14 <style include="settings-shared"></style>	19 <style include="settings-shared"></style>

15 <settings-animated-pages id="pages" section="device"	20 <settings-animated-pages id="pages" section="device"

16 current-route="{{currentRoute}}">	21 current-route="{{currentRoute}}">

17 <neon-animatable id="main">	22 <neon-animatable id="main">

18 <div class="settings-box first" on-tap="onTouchpadTap_">	23 <div id="touchpadRow" class="settings-box first"

19 <iron-icon icon="hardware:keyboard"></iron-icon>	24 on-tap="onTouchpadTap_">

	25 <!-- TODO(michaelpg): Get a touchpad icon. -->

	26 <iron-icon icon="image:brightness-1"></iron-icon>

20 <div class="middle">[[i18n('touchpadTitle')]]</div>	27 <div class="middle">[[i18n('touchpadTitle')]]</div>

21 </div>	28 </div>

22 <div class="settings-box">	29 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_">

23 <iron-icon icon="image:brightness-1"></iron-icon>	30 <iron-icon icon="hardware:keyboard"></iron-icon>

24 <div class="middle">[[i18n('keyboardTitle')]]</div>	31 <div class="middle">[[i18n('keyboardTitle')]]</div>

25 </div>	32 </div>

26 </neon-animatable>	33 </neon-animatable>

27 <neon-animatable id="touchpad">	34 <neon-animatable id="touchpad">

28 <settings-subheader page-title="[[i18n('touchpadTitle')]]">	35 <settings-subheader page-title="[[i18n('touchpadTitle')]]">

29 </settings-subheader>	36 </settings-subheader>

30 <settings-touchpad prefs="{{prefs}}"></settings-touchpad>	37 <settings-touchpad prefs="{{prefs}}"></settings-touchpad>

31 </neon-animatable>	38 </neon-animatable>

	39 <neon-animatable id="keyboard">

	40 <settings-subheader page-title="[[i18n('keyboardTitle')]]">

	41 </settings-subheader>

	42 <settings-keyboard prefs="{{prefs}}"></settings-keyboard>

	43 </neon-animatable>

32 </settings-animated-pages>	44 </settings-animated-pages>

33 </template>	45 </template>

34 <script src="device_page.js"></script>	46 <script src="device_page.js"></script>

35 </dom-module>	47 </dom-module>

OLD	NEW