Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

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

Issue 2799163003: MD Settings: Bluetooth: Hide subpage arrow when disabled and fix string (Closed)
Patch Set: Fix connect string Created 3 years, 8 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
OLDNEW
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">
(...skipping 14 matching lines...) Expand all
25 $i18n{bluetoothPageTitle} 25 $i18n{bluetoothPageTitle}
26 <div class="secondary" id="bluetoothSecondary"> 26 <div class="secondary" id="bluetoothSecondary">
27 [[getOnOffString_(bluetoothEnabled_, 27 [[getOnOffString_(bluetoothEnabled_,
28 '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]] 28 '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]]
29 </div> 29 </div>
30 </div> 30 </div>
31 <cr-policy-pref-indicator icon-aria-label="$i18n{bluetoothPageTitle}" 31 <cr-policy-pref-indicator icon-aria-label="$i18n{bluetoothPageTitle}"
32 pref="[[prefs.cros.device.allow_bluetooth]]" 32 pref="[[prefs.cros.device.allow_bluetooth]]"
33 hidden="[[prefs.cros.device.allow_bluetooth.value]]"> 33 hidden="[[prefs.cros.device.allow_bluetooth.value]]">
34 </cr-policy-pref-indicator> 34 </cr-policy-pref-indicator>
35 <button class="subpage-arrow" is="paper-icon-button-light" 35 <template is="dom-if" if="[[bluetoothEnabled_]]">
36 on-tap="onSubpageArrowTap_" aria-label="$i18n{bluetoothPageTitle}" 36 <button class="subpage-arrow" is="paper-icon-button-light"
37 aria-describedby="bluetoothSecondary"> 37 on-tap="onSubpageArrowTap_"
38 </button> 38 aria-label="$i18n{bluetoothPageTitle}"
39 aria-describedby="bluetoothSecondary">
40 </button>
41 </template>
39 <div class="secondary-action"> 42 <div class="secondary-action">
40 <paper-toggle-button id="enableBluetooth" 43 <paper-toggle-button id="enableBluetooth"
41 checked="{{bluetoothEnabled_}}" 44 checked="{{bluetoothEnabled_}}"
42 disabled="[[!adapterState_.available]]" on-tap="stopTap_" 45 disabled="[[!adapterState_.available]]" on-tap="stopTap_"
43 aria-label="$i18n{bluetoothToggleA11yLabel}"> 46 aria-label="$i18n{bluetoothToggleA11yLabel}">
44 </paper-toggle-button> 47 </paper-toggle-button>
45 </div> 48 </div>
46 </div> 49 </div>
47 </neon-animatable> 50 </neon-animatable>
48 51
49 <template is="dom-if" route-path="/bluetoothDevices"> 52 <template is="dom-if" route-path="/bluetoothDevices">
50 <settings-subpage associated-control="[[$$('#bluetoothDevices')]]" 53 <settings-subpage associated-control="[[$$('#bluetoothDevices')]]"
51 page-title="$i18n{bluetoothPageTitle}"> 54 page-title="$i18n{bluetoothPageTitle}">
52 <settings-bluetooth-subpage 55 <settings-bluetooth-subpage
53 adapter-state="[[adapterState_]]" 56 adapter-state="[[adapterState_]]"
54 bluetooth-enabled="{{bluetoothEnabled_}}" 57 bluetooth-enabled="{{bluetoothEnabled_}}"
55 bluetooth="[[bluetooth]]" 58 bluetooth="[[bluetooth]]"
56 bluetooth-private="[[bluetoothPrivate]]"> 59 bluetooth-private="[[bluetoothPrivate]]">
57 </settings-bluetooth-subpage> 60 </settings-bluetooth-subpage>
58 </settings-subpage> 61 </settings-subpage>
59 </template> 62 </template>
60 63
61 </settings-animated-pages> 64 </settings-animated-pages>
62 </template> 65 </template>
63 <script src="bluetooth_page.js"></script> 66 <script src="bluetooth_page.js"></script>
64 </dom-module> 67 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698