chrome/browser/resources/chromeos/login/oobe_hid_detection.html - Issue 2600983003: ChromeOS MD-OOBE: Add HID detection screen.

Side by Side Diff: chrome/browser/resources/chromeos/login/oobe_hid_detection.html

Issue 2600983003: ChromeOS MD-OOBE: Add HID detection screen. (Closed)

Patch Set: Fix build Created 3 years, 11 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:

« chrome/browser/resources/chromeos/login/oobe_hid_detection.css ('K') | « chrome/browser/resources/chromeos/login/oobe_hid_detection.css ('k') | chrome/browser/resources/chromeos/login/oobe_hid_detection.js » ('j') | chrome/browser/resources/chromeos/login/oobe_hid_detection.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <!-- Copyright 2016 The Chromium Authors. All rights reserved.

	2 Use of this source code is governed by a BSD-style license that can be

	3 found in the LICENSE file. -->
	stevenjb 2016/12/28 20:47:04 No Copyright in .html No Copyright in .html Alexander Alekseev 2016/12/28 22:56:22 Done. Show quoted text On 2016/12/28 20:47:04, stevenjb wrote: > No Copyright in .html Done.
	4

	5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">

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

	7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-i conset-svg.html">

	8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">

	9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html ">

	10

	11 <iron-iconset-svg name="oobe-hid-detection" size="24">

	12 <svg>

	13 <defs>

	14 <g id="bluetooth"><path d="M17.71 7.71L12 2h-1v7.59L6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 11 14.41V22h1l5.71-5.71-4.3-4.29 4.3-4.29zM13 5.83l1.88 1.88L13 9.59V5.83zm1.88 10.46L13 18.17v-3.76l1.88 1.88z"/></g>

	15 </defs>

	16 </svg>

	17 </iron-iconset-svg>

	18

	19 <dom-module name="oobe-hid-detection-md">

	20 <template>

	21 <link rel="stylesheet" href="oobe_hid_detection.css">

	22 <link rel="stylesheet" href="oobe_dialog_parameters.css">

	23 <link rel="stylesheet" href="../../options/chromeos/bluetooth.css">

	24 <oobe-dialog has-buttons>

	25 <iron-icon icon="oobe-hid-detection:bluetooth" class="oobe-icon"></iron-ic on>
	stevenjb 2016/12/28 20:47:04 Use multiple lines instead of wrapping Use multiple lines instead of wrapping Alexander Alekseev 2016/12/28 22:56:22 Done. Show quoted text On 2016/12/28 20:47:04, stevenjb wrote: > Use multiple lines instead of wrapping Done.
	26 <div class="header">

	27 <h1 class="title" i18n-content="hidDetectionInvitation"></h1>

	28 <div class="subtitle" i18n-content="hidDetectionPrerequisites"></div>

	29 </div>

	30 <div class="footer flex layout vertical">

	31 <div class="layout vertical justified hid-selection-entry">

	32 <div class="layout horizontal center">
	stevenjb 2016/12/28 20:47:04 Can we combine these divs? Can we combine these divs? Alexander Alekseev 2016/12/28 22:56:22 This inner div helps positioning of "#mouse-tick" Show quoted text On 2016/12/28 20:47:04, stevenjb wrote: > Can we combine these divs? This inner div helps positioning of "#mouse-tick" and "#keyboard-tick" with the same style.
	33 <img id="mouse-icon" alt=""

	34 src="chrome://theme/IDR_BLUETOOTH_MOUSE">

	35 <img id="mouse-tick" alt="" hidden="[[!tickIsVisible_(mouseState)]]"

	36 src="chrome://theme/IDR_BLUETOOTH_PAIRING_TICK">

	37 <div id="mouse-label-searching" aria-live="polite"

	38 i18n-content="hidDetectionMouseSearching"

	39 hidden="[[notEq_(mouseState, screen.CONNECTION.SEARCHING)]]">

	40 </div>

	41 <div id="mouse-label-usb" aria-live="polite"

	42 i18n-content="hidDetectionUSBMouseConnected"

	43 hidden="[[notEq_(mouseState, screen.CONNECTION.USB)]]">

	44 </div>

	45 <div id="mouse-label-connected" aria-live="polite"

	46 i18n-content="hidDetectionPointingDeviceConnected"

	47 hidden="[[notEq_(mouseState, screen.CONNECTION.CONNECTED)]]">

	48 </div>

	49 <div id="mouse-label-paired" aria-live="polite"

	50 i18n-content="hidDetectionBTMousePaired"

	51 hidden="[[notEq_(mouseState, screen.CONNECTION.PAIRED)]]">

	52 </div>

	53 </div>

	54 </div>

	55 <div class="layout vertical hid-selection-entry">

	56 <div class="layout horizontal center hid-label">

	57 <img id="keyboard-icon" alt=""

	58 src="chrome://theme/IDR_BLUETOOTH_KEYBOARD">

	59 <img id="keyboard-tick" alt=""

	60 hidden="[[!tickIsVisible_(keyboardState)]]"

	61 src="chrome://theme/IDR_BLUETOOTH_PAIRING_TICK">

	62 <div aria-live="polite"

	63 i18n-content="hidDetectionKeyboardSearching"

	64 hidden="[[notEq_(keyboardState, screen.CONNECTION.SEARCHING)]]">

	65 </div>

	66 <div aria-live="polite"

	67 i18n-content="hidDetectionUSBKeyboardConnected"

	68 hidden="[[notEq_(keyboardState, screen.CONNECTION.USB)]]">

	69 </div>

	70 <div aria-live="polite"

	71 hidden="[[notEq_(keyboardState, screen.CONNECTION.PAIRED)]]">

	72 [[keyboardPairedLabel]]

	73 </div>

	74 <div hidden="[[notEq_(keyboardState, screen.CONNECTION.PAIRING)]]">

	75 [[keyboardPairingLabel]]

	76 </div>

	77 </div>

	78 <div id="hid-keyboard-pincode" class="layout horizontal center-justifi ed" hidden="[[!keyboardPincodeVisible]]">

	79 <div id="hid-keyboard-pincode-sym-1" class="bluetooth-keyboard-butto n">

	80 </div>

	81 <div id="hid-keyboard-pincode-sym-2" class="bluetooth-keyboard-butto n">

	82 </div>

	83 <div id="hid-keyboard-pincode-sym-3" class="bluetooth-keyboard-butto n">

	84 </div>

	85 <div id="hid-keyboard-pincode-sym-4" class="bluetooth-keyboard-butto n">

	86 </div>

	87 <div id="hid-keyboard-pincode-sym-5" class="bluetooth-keyboard-butto n">

	88 </div>

	89 <div id="hid-keyboard-pincode-sym-6" class="bluetooth-keyboard-butto n">

	90 </div>
	stevenjb 2016/12/28 20:47:04 Fix wrapping on all of these Fix wrapping on all of these Alexander Alekseev 2016/12/28 22:56:22 Done. Show quoted text On 2016/12/28 20:47:04, stevenjb wrote: > Fix wrapping on all of these Done.
	91 <div id="hid-keyboard-pincode-sym-7"

	92 i18n-content="hidDetectionBTEnterKey"

	93 class="bluetooth-keyboard-button">

	94 </div>

	95 </div>

	96 </div>

	97 </div>

	98 <div class="bottom-buttons flex layout horizontal end-justified">

	99 <oobe-text-button id="hid-continue-button" inverse on-tap="onHIDContinue _"
	stevenjb 2016/12/28 20:47:04 nit: By convention we would name the function 'onH nit: By convention we would name the function 'onHIDContinueTap_' Also: Fix wrapping Alexander Alekseev 2016/12/28 22:56:22 Done. Show quoted text On 2016/12/28 20:47:04, stevenjb wrote: > nit: By convention we would name the function 'onHIDContinueTap_' > > Also: Fix wrapping Done.
	100 disabled="[[continueButtonDisabled]]">

	101 <div i18n-content="hidDetectionContinue" id="continue-button-text">

	102 </div>

	103 </oobe-text-button>

	104 </div>

	105 </oobe-dialog>

	106 </template>

	107 </dom-module>

OLD	NEW