OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 1 <link rel="import" href="chrome://resources/html/i18n_behavior.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-button/paper-butt on.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
4 <link rel="import" href="android_apps_browser_proxy.html"> | 4 <link rel="import" href="android_apps_browser_proxy.html"> |
5 <link rel="import" href="../controls/settings_toggle_button.html"> | |
6 <link rel="import" href="../i18n_setup.html"> | 5 <link rel="import" href="../i18n_setup.html"> |
7 <link rel="import" href="../prefs/prefs_behavior.html"> | 6 <link rel="import" href="../prefs/prefs_behavior.html"> |
8 <link rel="import" href="../settings_shared_css.html"> | 7 <link rel="import" href="../settings_shared_css.html"> |
9 | 8 |
10 <dom-module id="settings-android-apps-page"> | 9 <dom-module id="settings-android-apps-subpage"> |
11 <template> | 10 <template> |
12 <style include="settings-shared"> | 11 <style include="settings-shared"></style> |
13 a { | |
14 -webkit-margin-start: 4px; | |
15 } | |
16 | 12 |
17 .indented { | 13 <div id="manageApps" class="settings-box first" |
18 -webkit-margin-start: var(--settings-indent-width); | |
19 } | |
20 </style> | |
21 | |
22 <div class="settings-box first"> | |
23 <settings-toggle-button id="enabled" class="start" | |
24 pref="{{prefs.arc.enabled}}" | |
25 label="$i18n{androidAppsEnabled}" | |
26 on-settings-boolean-control-change="onArcEnabledChange_" | |
27 no-set-pref> | |
28 <a href="$i18nRaw{androidAppsLearnMoreUrl}" target="_blank" | |
29 class="more-actions" on-tap="stopPropagation_"> | |
30 $i18n{androidAppsLearnMore} | |
31 </a> | |
32 </settings-toggle-button> | |
33 </div> | |
34 | |
35 <div id="manageApps" class="settings-box continuation indented" | |
36 on-keydown="onManageAndroidAppsKeydown_" | 14 on-keydown="onManageAndroidAppsKeydown_" |
37 on-tap="onManageAndroidAppsTap_" actionable | 15 on-tap="onManageAndroidAppsTap_" actionable |
38 hidden="[[!androidAppsInfo_.appReady]]"> | 16 hidden="[[!androidAppsInfo_.appReady]]"> |
39 <div class="start"> | 17 <div class="start"> |
40 <div>$i18n{androidAppsManageApps}</div> | 18 <div>$i18n{androidAppsManageApps}</div> |
41 </div> | 19 </div> |
42 <button class="icon-external" is="paper-icon-button-light"> | 20 <button class="icon-external" is="paper-icon-button-light"> |
43 </button> | 21 </button> |
44 </div> | 22 </div> |
45 | 23 |
24 <template is="dom-if" if="[[allowRemove_(prefs.arc.enabled.*)]]"> | |
25 <div id="android-apps" class="settings-box" actionable | |
26 on-tap="onRemoveTap_"> | |
Dan Beam
2017/03/30 13:24:22
most of our code uses the naming convention: onIdN
stevenjb
2017/03/30 23:05:36
Renamed. The id is used in the (now updated) tests
| |
27 <div class="start">$i18n{androidAppsRemove}</div> | |
28 <button class="subpage-arrow" is="paper-icon-button-light" | |
29 aria-label="$i18n{androidAppsRemove}"> | |
30 </button> | |
31 </div> | |
32 </template> | |
33 | |
46 <!-- Confirm disable android apps dialog --> | 34 <!-- Confirm disable android apps dialog --> |
47 <dialog is="cr-dialog" id="confirmDisableDialog" close-text="$i18n{close}" | 35 <dialog is="cr-dialog" id="confirmDisableDialog" close-text="$i18n{close}" |
48 on-cancel="onConfirmDisableDialogCancel_"> | 36 on-cancel="onConfirmDisableDialogCancel_"> |
49 <div class="title">$i18n{androidAppsDisableDialogTitle}</div> | 37 <div class="title">$i18n{androidAppsDisableDialogTitle}</div> |
50 <div class="body" inner-h-t-m-l="[[getDialogBody_()]]"></div> | 38 <div class="body" inner-h-t-m-l="[[getDialogBody_()]]"></div> |
Dan Beam
2017/03/30 13:24:22
can you just change to using i18n('...') directly
stevenjb
2017/03/30 23:05:36
Done. (I think it's a little more likely now that
| |
51 <div class="button-container"> | 39 <div class="button-container"> |
52 <paper-button class="cancel-button" | 40 <paper-button class="cancel-button" |
53 on-tap="onConfirmDisableDialogCancel_"> | 41 on-tap="onConfirmDisableDialogCancel_"> |
54 $i18n{cancel} | 42 $i18n{cancel} |
55 </paper-button> | 43 </paper-button> |
56 <paper-button class="action-button" | 44 <paper-button class="action-button" |
57 on-tap="onConfirmDisableDialogConfirm_"> | 45 on-tap="onConfirmDisableDialogConfirm_"> |
58 $i18n{confirm} | 46 $i18n{confirm} |
59 </paper-button> | 47 </paper-button> |
60 </div> | 48 </div> |
61 </dialog> | 49 </dialog> |
50 | |
62 </template> | 51 </template> |
63 <script src="android_apps_page.js"></script> | 52 <script src="android_apps_subpage.js"></script> |
64 </dom-module> | 53 </dom-module> |
OLD | NEW |