Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/action_link.html"> | 1 <link rel="import" href="chrome://resources/html/action_link.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/paper-icon-button/paper -icon-button-light.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
| 4 <link rel="import" href="../controls/settings_toggle_button.html"> | 4 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 5 <link rel="import" href="../settings_shared_css.html"> | 5 <link rel="import" href="../settings_shared_css.html"> |
| 6 | 6 |
| 7 <dom-module id="settings-stylus"> | 7 <dom-module id="settings-stylus"> |
| 8 <template> | 8 <template> |
| 9 <style include="settings-shared md-select"> | 9 <style include="settings-shared md-select"> |
| 10 .settings-box > .secondary { | 10 .settings-box > .secondary { |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 33 | 33 |
| 34 <div class="settings-box"> | 34 <div class="settings-box"> |
| 35 <settings-toggle-button class="start" | 35 <settings-toggle-button class="start" |
| 36 pref="{{prefs.settings.launch_palette_on_eject_event}}" | 36 pref="{{prefs.settings.launch_palette_on_eject_event}}" |
| 37 label="$i18n{stylusAutoOpenStylusTools}" | 37 label="$i18n{stylusAutoOpenStylusTools}" |
| 38 disabled="[[!prefs.settings.enable_stylus_tools.value]]"> | 38 disabled="[[!prefs.settings.enable_stylus_tools.value]]"> |
| 39 </settings-toggle-button> | 39 </settings-toggle-button> |
| 40 </div> | 40 </div> |
| 41 | 41 |
| 42 <div class="settings-box"> | 42 <div class="settings-box"> |
| 43 <div class="start">$i18n{stylusNoteTakingApp}</div> | 43 <div id="stylusNoteTakingApp" class="start"> |
|
Daniel Erat
2017/04/13 19:40:16
mind making this instead be something like stylusN
hcarmona
2017/04/13 20:27:48
Done.
| |
| 44 $i18n{stylusNoteTakingApp} | |
| 45 </div> | |
| 44 | 46 |
| 45 <div id="no-apps" class="secondary" | 47 <div id="no-apps" class="secondary" |
| 46 hidden$="[[!showNoApps_(appChoices_, waitingForAndroid_)]]"> | 48 hidden$="[[!showNoApps_(appChoices_, waitingForAndroid_)]]"> |
| 47 $i18n{stylusNoteTakingAppNoneAvailable} | 49 $i18n{stylusNoteTakingAppNoneAvailable} |
| 48 </div> | 50 </div> |
| 49 | 51 |
| 50 <div id="waiting" class="secondary" hidden$="[[!waitingForAndroid_]]"> | 52 <div id="waiting" class="secondary" hidden$="[[!waitingForAndroid_]]"> |
| 51 $i18n{stylusNoteTakingAppWaitingForAndroid} | 53 $i18n{stylusNoteTakingAppWaitingForAndroid} |
| 52 <paper-spinner active></paper-spinner> | 54 <paper-spinner active></paper-spinner> |
| 53 </div> | 55 </div> |
| 54 | 56 |
| 55 <div id="select-app" class="md-select-wrapper" | 57 <div id="select-app" class="md-select-wrapper" |
| 56 hidden$="[[!showApps_(appChoices_, waitingForAndroid_)]]"> | 58 hidden$="[[!showApps_(appChoices_, waitingForAndroid_)]]"> |
| 57 <select id="menu" class="md-select" on-change="onSelectedAppChanged_"> | 59 <select id="menu" class="md-select" on-change="onSelectedAppChanged_" |
| 60 aria-labelledby="stylusNoteTakingApp"> | |
| 58 <template is="dom-repeat" items="[[appChoices_]]"> | 61 <template is="dom-repeat" items="[[appChoices_]]"> |
| 59 <option value="[[item.value]]" selected="[[item.preferred]]"> | 62 <option value="[[item.value]]" selected="[[item.preferred]]"> |
| 60 [[item.name]] | 63 [[item.name]] |
| 61 </option> | 64 </option> |
| 62 </template> | 65 </template> |
| 63 </select> | 66 </select> |
| 64 <span class="md-select-underline"></span> | 67 <span class="md-select-underline"></span> |
| 65 </div> | 68 </div> |
| 66 </div> | 69 </div> |
| 67 | 70 |
| 68 <!-- TODO(scottchen): Make a proper a[href].settings-box with | 71 <!-- TODO(scottchen): Make a proper a[href].settings-box with |
| 69 icon-external (see: https://crbug.com/684005)--> | 72 icon-external (see: https://crbug.com/684005)--> |
| 70 <div class="settings-box two-line" on-tap="onFindAppsTap_" actionable | 73 <div class="settings-box two-line" on-tap="onFindAppsTap_" actionable |
| 71 hidden$="[[!prefs.arc.enabled.value]]"> | 74 hidden$="[[!prefs.arc.enabled.value]]"> |
| 72 <div class="start"> | 75 <div class="start"> |
| 73 $i18n{stylusFindMoreAppsPrimary} | 76 $i18n{stylusFindMoreAppsPrimary} |
| 74 <div class="secondary" id="stylusFindMoreAppsSecondary"> | 77 <div class="secondary" id="stylusFindMoreAppsSecondary"> |
| 75 $i18n{stylusFindMoreAppsSecondary} | 78 $i18n{stylusFindMoreAppsSecondary} |
| 76 </div> | 79 </div> |
| 77 </div> | 80 </div> |
| 78 <button class="icon-external" is="paper-icon-button-light" | 81 <button class="icon-external" is="paper-icon-button-light" |
| 79 aria-label="$i18n{stylusFindMoreAppsPrimary}" | 82 aria-label="$i18n{stylusFindMoreAppsPrimary}" |
| 80 aria-describedby="stylusFindMoreAppsSecondary"></button> | 83 aria-describedby="stylusFindMoreAppsSecondary"></button> |
| 81 </div> | 84 </div> |
| 82 | 85 |
| 83 </template> | 86 </template> |
| 84 <script src="stylus.js"></script> | 87 <script src="stylus.js"></script> |
| 85 </dom-module> | 88 </dom-module> |
| OLD | NEW |