Commit 7aaf8265 authored by dpapad's avatar dpapad Committed by Commit Bot

CrOS Settings: Migrate bluetooth_page/ from paper-toggle-button to cr-toggle.

This is in preparation of updating cr-toggle's style for MD refresh, as well
as removing paper-toggle-button from third_party/polymer.

Bug: 768073
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Ic26a8cd965319e5be453398e68eb49fec556910a
Reviewed-on: https://chromium-review.googlesource.com/1043448Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556307}
parent 4b3ad422
<link rel="import" href="chrome://resources/html/polymer.html"> <link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html"> <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html">
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html"> <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html">
<link rel="import" href="../i18n_setup.html"> <link rel="import" href="../i18n_setup.html">
<link rel="import" href="../icons.html"> <link rel="import" href="../icons.html">
<link rel="import" href="../prefs/prefs.html"> <link rel="import" href="../prefs/prefs.html">
...@@ -43,13 +43,12 @@ ...@@ -43,13 +43,12 @@
</paper-icon-button-light> </paper-icon-button-light>
</template> </template>
<div class="separator"></div> <div class="separator"></div>
<paper-toggle-button id="enableBluetooth" <cr-toggle id="enableBluetooth"
checked="{{bluetoothToggleState_}}" checked="{{bluetoothToggleState_}}"
disabled$= disabled$=
"[[!isToggleEnabled_(adapterState_, stateChangeInProgress_)]]" "[[!isToggleEnabled_(adapterState_, stateChangeInProgress_)]]"
on-click="stopTap_"
aria-label="$i18n{bluetoothToggleA11yLabel}"> aria-label="$i18n{bluetoothToggleA11yLabel}">
</paper-toggle-button> </cr-toggle>
</div> </div>
</neon-animatable> </neon-animatable>
......
...@@ -188,14 +188,6 @@ Polymer({ ...@@ -188,14 +188,6 @@ Polymer({
this.openSubpage_(); this.openSubpage_();
}, },
/**
* @param {!Event} e
* @private
*/
stopTap_: function(e) {
e.stopPropagation();
},
/** /**
* @param {!Event} e * @param {!Event} e
* @private * @private
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<link rel="import" href="chrome://resources/cr_components/chromeos/bluetooth_dialog.html"> <link rel="import" href="chrome://resources/cr_components/chromeos/bluetooth_dialog.html">
<link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.html"> <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner-lite.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner-lite.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html">
<link rel="import" href="../i18n_setup.html"> <link rel="import" href="../i18n_setup.html">
<link rel="import" href="../icons.html"> <link rel="import" href="../icons.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../settings_shared_css.html">
...@@ -44,12 +44,11 @@ ...@@ -44,12 +44,11 @@
[[getOnOffString_(bluetoothToggleState, [[getOnOffString_(bluetoothToggleState,
'$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]] '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]]
</div> </div>
<paper-toggle-button id="enableBluetooth" <cr-toggle id="enableBluetooth"
checked="{{bluetoothToggleState}}" checked="{{bluetoothToggleState}}"
disabled$="[[!isToggleEnabled_(adapterState, stateChangeInProgress)]]" disabled$="[[!isToggleEnabled_(adapterState, stateChangeInProgress)]]"
aria-label="$i18n{bluetoothToggleA11yLabel}" aria-label="$i18n{bluetoothToggleA11yLabel}">
on-click="stopTap_"> </cr-toggle>
</paper-toggle-button>
</div> </div>
<!-- Paired device list --> <!-- Paired device list -->
......
...@@ -366,14 +366,6 @@ Polymer({ ...@@ -366,14 +366,6 @@ Polymer({
console.error('Unexected action: ' + action); console.error('Unexected action: ' + action);
}, },
/**
* @param {!Event} event
* @private
*/
stopTap_: function(event) {
event.stopPropagation();
},
/** /**
* @param {!Event} event * @param {!Event} event
* @private * @private
......
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