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

Unified Diff: chrome/browser/resources/settings/android_apps_page/android_apps_page.html

Issue 2798753002: Revert of MD Settings: Google Play Store: Add subpage and polish (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/android_apps_page/android_apps_page.html
diff --git a/chrome/browser/resources/settings/android_apps_page/android_apps_page.html b/chrome/browser/resources/settings/android_apps_page/android_apps_page.html
index 61db0487ce9e5532700754330e8287bbc807f74a..e8bbd3cab2021d1db80b93546f07e5cc7a34bb2e 100644
--- a/chrome/browser/resources/settings/android_apps_page/android_apps_page.html
+++ b/chrome/browser/resources/settings/android_apps_page/android_apps_page.html
@@ -1,64 +1,64 @@
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/html/polymer.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-button/paper-button.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
+<link rel="import" href="android_apps_browser_proxy.html">
+<link rel="import" href="../controls/settings_toggle_button.html">
<link rel="import" href="../i18n_setup.html">
<link rel="import" href="../prefs/prefs_behavior.html">
-<link rel="import" href="../settings_page/settings_animated_pages.html">
-<link rel="import" href="../settings_page/settings_subpage.html">
<link rel="import" href="../settings_shared_css.html">
-<link rel="import" href="android_apps_browser_proxy.html">
-<link rel="import" href="android_apps_subpage.html">
<dom-module id="settings-android-apps-page">
<template>
- <style include="settings-shared"></style>
+ <style include="settings-shared">
+ a {
+ -webkit-margin-start: 4px;
+ }
- <settings-animated-pages id="pages" section="androidApps">
- <neon-animatable route-path="default">
- <div id="android-apps" class="settings-box two-line first" actionable
- on-tap="onSubpageTap_">
- <div class="start">
- $i18n{androidAppsPageLabel}
- <div class="secondary" id="secondaryText"
- inner-h-t-m-l="[[getSubtext_(androidAppsInfo_.appReady)]]">
- </div>
- </div>
- <cr-policy-pref-indicator pref="[[prefs.arc.enabled]]"
- icon-aria-label="$i18n{androidAppsPageTitle}">
- </cr-policy-pref-indicator>
- <template is="dom-if" if="[[androidAppsInfo_.appReady]]">
- <button class="subpage-arrow" is="paper-icon-button-light"
- aria-label="$i18n{androidAppsPageTitle}"
- aria-describedby="secondaryText">
- </button>
- </template>
- <template is="dom-if" if="[[!androidAppsInfo_.appReady]]">
- <div class="secondary-action">
- <paper-button id="enable" class="secondary-button"
- on-tap="onEnableTap_"
- aria-label="$i18n{androidAppsPageTitle}"
- aria-describedby="secondaryText">
- $i18n{androidAppsEnable}
- </paper-button>
- </div>
- </template>
- </div>
- </neon-animatable>
+ .indented {
+ -webkit-margin-start: var(--settings-indent-width);
+ }
+ </style>
- <template is="dom-if" route-path="/androidApps/details">
- <settings-subpage
- associated-control="[[$$('#android-apps')]]"
- page-title="$i18n{androidAppsPageLabel}">
- <settings-android-apps-subpage
- android-apps-info="[[androidAppsInfo_]]" prefs="{{prefs}}">
- </settings-android-apps-subpage>
- </settings-subpage>
- </template>
- </settings-animated-pages>
+ <div class="settings-box first">
+ <settings-toggle-button id="enabled" class="start"
+ pref="{{prefs.arc.enabled}}"
+ label="$i18n{androidAppsEnabled}"
+ on-settings-boolean-control-change="onArcEnabledChange_"
+ no-set-pref>
+ <a href="$i18nRaw{androidAppsLearnMoreUrl}" target="_blank"
+ class="more-actions" on-tap="stopPropagation_">
+ $i18n{androidAppsLearnMore}
+ </a>
+ </settings-toggle-button>
+ </div>
+ <div id="manageApps" class="settings-box continuation indented"
+ on-keydown="onManageAndroidAppsKeydown_"
+ on-tap="onManageAndroidAppsTap_" actionable
+ hidden="[[!androidAppsInfo_.appReady]]">
+ <div class="start">
+ <div>$i18n{androidAppsManageApps}</div>
+ </div>
+ <button class="icon-external" is="paper-icon-button-light">
+ </button>
+ </div>
+
+ <!-- Confirm disable android apps dialog -->
+ <dialog is="cr-dialog" id="confirmDisableDialog" close-text="$i18n{close}"
+ on-cancel="onConfirmDisableDialogCancel_">
+ <div class="title">$i18n{androidAppsDisableDialogTitle}</div>
+ <div class="body" inner-h-t-m-l="[[getDialogBody_()]]"></div>
+ <div class="button-container">
+ <paper-button class="cancel-button"
+ on-tap="onConfirmDisableDialogCancel_">
+ $i18n{cancel}
+ </paper-button>
+ <paper-button class="action-button"
+ on-tap="onConfirmDisableDialogConfirm_">
+ $i18n{confirm}
+ </paper-button>
+ </div>
+ </dialog>
</template>
<script src="android_apps_page.js"></script>
</dom-module>
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/android_apps_page/android_apps_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698