| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 1 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 2 <link rel="import" href="chrome://resources/html/md_select_css.html"> |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <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-button/paper-butt
on.html"> |
| 4 <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-icon-button/paper
-icon-button-light.html"> |
| 5 <link rel="import" href="/controls/extension_controlled_indicator.html"> | 7 <link rel="import" href="/controls/extension_controlled_indicator.html"> |
| 8 <link rel="import" href="/controls/settings_checkbox.html"> |
| 9 <link rel="import" href="/icons.html"> |
| 10 <link rel="import" href="/i18n_setup.html"> |
| 6 <link rel="import" href="/route.html"> | 11 <link rel="import" href="/route.html"> |
| 7 <link rel="import" href="/search_engines_page/search_engines_page.html"> | 12 <link rel="import" href="/search_engines_page/search_engines_page.html"> |
| 8 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html"
> | 13 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html"
> |
| 9 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 14 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 10 <link rel="import" href="/settings_page/settings_subpage.html"> | 15 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 11 <link rel="import" href="/settings_shared_css.html"> | 16 <link rel="import" href="/settings_shared_css.html"> |
| 12 <link rel="import" href="/settings_vars_css.html"> | 17 <link rel="import" href="/settings_vars_css.html"> |
| 13 | 18 |
| 14 <dom-module id="settings-search-page"> | 19 <dom-module id="settings-search-page"> |
| 15 <template> | 20 <template> |
| 16 <style include="settings-shared md-select"> | 21 <style include="settings-shared md-select"> |
| 17 #search-wrapper { | 22 #search-wrapper { |
| 18 align-items: center; | 23 align-items: center; |
| 19 display: flex; | 24 display: flex; |
| 20 min-height: var(--settings-box-min-height); | 25 min-height: var(--settings-box-min-height); |
| 21 } | 26 } |
| 27 |
| 28 iron-icon { |
| 29 -webkit-padding-end: 16px; |
| 30 } |
| 31 |
| 32 .indented { |
| 33 -webkit-margin-start: 36px; |
| 34 } |
| 22 </style> | 35 </style> |
| 23 <settings-animated-pages id="pages" section="search"> | 36 <settings-animated-pages id="pages" section="search"> |
| 24 <neon-animatable route-path="default"> | 37 <neon-animatable route-path="default"> |
| 38 <!-- Omnibox search engine --> |
| 25 <div class="settings-box first block"> | 39 <div class="settings-box first block"> |
| 26 <div id="search-wrapper"> | 40 <div id="search-wrapper"> |
| 27 <p class="start">$i18n{searchExplanation}</p> | 41 <p class="start">$i18n{searchExplanation}</p> |
| 28 <div> | 42 <div> |
| 29 <select class="md-select" on-change="onChange_" | 43 <select class="md-select" on-change="onChange_" |
| 30 disabled$="[[ | 44 disabled$="[[ |
| 31 prefs.default_search_provider.enabled.extensionId]]"> | 45 prefs.default_search_provider.enabled.extensionId]]"> |
| 32 <template is="dom-repeat" items="[[searchEngines_]]"> | 46 <template is="dom-repeat" items="[[searchEngines_]]"> |
| 33 <option selected$="[[item.default]]">[[item.name]]</option> | 47 <option selected$="[[item.default]]">[[item.name]]</option> |
| 34 </template> | 48 </template> |
| 35 </select> | 49 </select> |
| 36 <span class="md-select-underline"></span> | 50 <span class="md-select-underline"></span> |
| 37 </div> | 51 </div> |
| 38 </div> | 52 </div> |
| 39 <template is="dom-if" | 53 <template is="dom-if" |
| 40 if="[[prefs.default_search_provider.enabled.extensionId]]"> | 54 if="[[prefs.default_search_provider.enabled.extensionId]]"> |
| 41 <extension-controlled-indicator | 55 <extension-controlled-indicator |
| 42 extension-id="[[ | 56 extension-id="[[ |
| 43 prefs.default_search_provider.enabled.extensionId]]" | 57 prefs.default_search_provider.enabled.extensionId]]" |
| 44 extension-name="[[ | 58 extension-name="[[ |
| 45 prefs.default_search_provider.enabled.controlledByName]]" | 59 prefs.default_search_provider.enabled.controlledByName]]" |
| 46 extension-can-be-disabled="[[ | 60 extension-can-be-disabled="[[ |
| 47 prefs.default_search_provider.enabled.extensionCanBeDisabled
]]" | 61 prefs.default_search_provider.enabled.extensionCanBeDisabled
]]" |
| 48 on-disable-extension="onDisableExtension_"> | 62 on-disable-extension="onDisableExtension_"> |
| 49 </extension-controlled-indicator> | 63 </extension-controlled-indicator> |
| 50 </template> | 64 </template> |
| 51 </div> | 65 </div> |
| 66 |
| 67 <template is="dom-if" if="[[hotwordInfo_.allowed]]"> |
| 68 <!-- Hotword (OK Google) --> |
| 69 <div class="settings-box two-line"> |
| 70 <settings-checkbox id="hotwordSearchEnable" class="start" |
| 71 label="$i18n{searchOkGoogleLabel}" |
| 72 sub-label="[[getHotwordSearchEnableSubLabel_( |
| 73 hotwordInfo_.alwaysOn)]]" |
| 74 pref="{{hotwordSearchEnablePref_}}" |
| 75 on-change="onHotwordSearchEnableChange_"> |
| 76 <a href="$i18nRaw{hotwordLearnMoreUrl}" target="_blank" |
| 77 on-tap="doNothing_"> |
| 78 $i18n{searchOkGoogleLearnMore} |
| 79 </a> |
| 80 </settings-checkbox> |
| 81 <div class="secondary-action" |
| 82 hidden$="[[!getShowHotwordSearchRetrain_(hotwordInfo_.*)]]"> |
| 83 <paper-button on-tap="onRetrainTap_" class="secondary-button"> |
| 84 $i18n{searchOkGoogleRetrain} |
| 85 </paper-button> |
| 86 </div> |
| 87 </div> |
| 88 |
| 89 <template is="dom-if" |
| 90 if="[[getShowHotwordError_(hotwordInfo_.*, |
| 91 hotwordSearchEnablePref_)]]"> |
| 92 <div class="settings-box continuation indented"> |
| 93 <iron-icon icon="settings:warning"></iron-icon> |
| 94 <div inner-h-t-m-l="[[hotwordInfo_.errorMessage]]"></div> |
| 95 </div> |
| 96 </template> |
| 97 |
| 98 <template is="dom-if" if="[[hotwordInfo_.historyEnabled]]"> |
| 99 <div class="settings-box two-line continuation indented" |
| 100 on-tap="onManageAudioHistoryTap_" actionable> |
| 101 <div class="start"> |
| 102 <div> |
| 103 [[i18n('searchOkGoogleAudioHistoryLabel', |
| 104 hotwordInfo_.userName)]] |
| 105 </div> |
| 106 <div class="secondary"> |
| 107 $i18n{searchOkGoogleAudioHistorySubtext} |
| 108 </div> |
| 109 </div> |
| 110 <button class="icon-external" is="paper-icon-button-light"> |
| 111 </button> |
| 112 </div> |
| 113 </template> |
| 114 </template> |
| 115 |
| 116 <!-- Manage search engines --> |
| 52 <div id="subpage-trigger" class="settings-box two-line" | 117 <div id="subpage-trigger" class="settings-box two-line" |
| 53 on-tap="onManageSearchEnginesTap_" actionable> | 118 on-tap="onManageSearchEnginesTap_" actionable> |
| 54 <div class="start"> | 119 <div class="start"> |
| 55 $i18n{searchEnginesManage} | 120 $i18n{searchEnginesManage} |
| 56 <div class="secondary"> | 121 <div class="secondary"> |
| 57 $i18n{searchEnginesManageDescription} | 122 $i18n{searchEnginesManageDescription} |
| 58 </div> | 123 </div> |
| 59 </div> | 124 </div> |
| 60 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 125 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
| 61 </div> | 126 </div> |
| 62 </neon-animatable> | 127 </neon-animatable> |
| 63 <template is="dom-if" route-path="/searchEngines"> | 128 <template is="dom-if" route-path="/searchEngines"> |
| 64 <settings-subpage | 129 <settings-subpage |
| 65 associated-control="[[$$('#subpage-trigger')]]" | 130 associated-control="[[$$('#subpage-trigger')]]" |
| 66 page-title="$i18n{searchEnginesManage}"> | 131 page-title="$i18n{searchEnginesManage}"> |
| 67 <settings-search-engines-page></settings-search-engines-page> | 132 <settings-search-engines-page></settings-search-engines-page> |
| 68 </settings-subpage> | 133 </settings-subpage> |
| 69 </template> | 134 </template> |
| 70 </settings-animated-pages> | 135 </settings-animated-pages> |
| 71 </template> | 136 </template> |
| 72 <script src="search_page.js"></script> | 137 <script src="search_page.js"></script> |
| 73 </dom-module> | 138 </dom-module> |
| OLD | NEW |