OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> |
2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> |
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> |
7 <link rel="import" href="../i18n_setup.html"> | 7 <link rel="import" href="../i18n_setup.html"> |
8 <link rel="import" href="../icons.html"> | 8 <link rel="import" href="../icons.html"> |
9 <link rel="import" href="../prefs/prefs.html"> | 9 <link rel="import" href="../prefs/prefs.html"> |
10 <link rel="import" href="../settings_page/settings_animated_pages.html"> | 10 <link rel="import" href="../settings_page/settings_animated_pages.html"> |
11 <link rel="import" href="../settings_page/settings_subpage.html"> | 11 <link rel="import" href="../settings_page/settings_subpage.html"> |
12 <link rel="import" href="../settings_shared_css.html"> | 12 <link rel="import" href="../settings_shared_css.html"> |
13 <link rel="import" href="bluetooth_subpage.html"> | 13 <link rel="import" href="bluetooth_subpage.html"> |
14 | 14 |
15 <dom-module id="settings-bluetooth-page"> | 15 <dom-module id="settings-bluetooth-page"> |
16 <template> | 16 <template> |
17 <style include="settings-shared"> | 17 <style include="settings-shared"> |
18 </style> | 18 </style> |
19 <settings-animated-pages id="pages" section="bluetooth"> | 19 <settings-animated-pages id="pages" section="bluetooth" |
20 focus-config="[[focusConfig_]]"> | |
20 <neon-animatable route-path="default"> | 21 <neon-animatable route-path="default"> |
21 <div id="bluetoothDevices" | 22 <div id="bluetoothDevices" |
22 class="settings-box two-line" actionable on-tap="onTap_"> | 23 class="settings-box two-line" actionable on-tap="onTap_"> |
23 <iron-icon icon="[[getIcon_(bluetoothToggleState_)]]"></iron-icon> | 24 <iron-icon icon="[[getIcon_(bluetoothToggleState_)]]"></iron-icon> |
24 <div class="middle"> | 25 <div class="middle"> |
25 $i18n{bluetoothPageTitle} | 26 $i18n{bluetoothPageTitle} |
26 <div class="secondary" id="bluetoothSecondary"> | 27 <div class="secondary" id="bluetoothSecondary"> |
27 [[getOnOffString_(bluetoothToggleState_, | 28 [[getOnOffString_(bluetoothToggleState_, |
28 '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]] | 29 '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]] |
29 </div> | 30 </div> |
30 </div> | 31 </div> |
31 <cr-policy-pref-indicator icon-aria-label="$i18n{bluetoothPageTitle}" | 32 <cr-policy-pref-indicator icon-aria-label="$i18n{bluetoothPageTitle}" |
32 pref="[[prefs.cros.device.allow_bluetooth]]" | 33 pref="[[prefs.cros.device.allow_bluetooth]]" |
33 hidden="[[prefs.cros.device.allow_bluetooth.value]]"> | 34 hidden="[[prefs.cros.device.allow_bluetooth.value]]"> |
34 </cr-policy-pref-indicator> | 35 </cr-policy-pref-indicator> |
35 <template is="dom-if" if="[[bluetoothEnabled_]]"> | 36 <template is="dom-if" if="[[bluetoothToggleState_]]"> |
dpapad
2017/04/25 21:25:19
Was this pointing to a non-existent Polymer proper
stevenjb
2017/04/25 23:32:53
Correct. A renamed property to be specific.
| |
36 <button class="subpage-arrow" is="paper-icon-button-light" | 37 <button class="subpage-arrow" is="paper-icon-button-light" |
37 on-tap="onSubpageArrowTap_" | 38 on-tap="onSubpageArrowTap_" |
38 aria-label="$i18n{bluetoothPageTitle}" | 39 aria-label="$i18n{bluetoothPageTitle}" |
39 aria-describedby="bluetoothSecondary"> | 40 aria-describedby="bluetoothSecondary"> |
40 </button> | 41 </button> |
41 </template> | 42 </template> |
42 <div class="secondary-action"> | 43 <div class="secondary-action"> |
43 <paper-toggle-button id="enableBluetooth" | 44 <paper-toggle-button id="enableBluetooth" |
44 checked="{{bluetoothToggleState_}}" | 45 checked="{{bluetoothToggleState_}}" |
45 disabled$="[[bluetoothToggleDisabled_]]" on-tap="stopTap_" | 46 disabled$="[[bluetoothToggleDisabled_]]" on-tap="stopTap_" |
(...skipping 13 matching lines...) Expand all Loading... | |
59 bluetooth="[[bluetooth]]" | 60 bluetooth="[[bluetooth]]" |
60 bluetooth-private="[[bluetoothPrivate]]"> | 61 bluetooth-private="[[bluetoothPrivate]]"> |
61 </settings-bluetooth-subpage> | 62 </settings-bluetooth-subpage> |
62 </settings-subpage> | 63 </settings-subpage> |
63 </template> | 64 </template> |
64 | 65 |
65 </settings-animated-pages> | 66 </settings-animated-pages> |
66 </template> | 67 </template> |
67 <script src="bluetooth_page.js"></script> | 68 <script src="bluetooth_page.js"></script> |
68 </dom-module> | 69 </dom-module> |
OLD | NEW |