[App Management] Rename localized string labels.

This CL renames the labels of App Management's localized strings to
prevent overlap with other settings' localized string labels. It also
removes any unused strings.

Bug: 1014815
Change-Id: I52b20363b140d1abc7839f763013eeeff6d31513
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1862888Reviewed-by: Trent Apted <tapted@chromium.org>
Commit-Queue: Jeevan Shikaram <jshikaram@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706775}

chrome/app/app_management_strings.grdp

 <?xml version="1.0" encoding="utf-8"?>
 
 <grit-part>
-  <message name="IDS_APP_MANAGEMENT_ANDROID_SETTINGS" desc="Label for the open Android settings button on the ARC app permissions page.">
-    Open Android settings
-  </message>
-  <message name="IDS_APP_MANAGEMENT_APP_LIST_PREVIEW" desc="A label that summarizes a list of apps by naming up to 3 apps, finishing with 'X more apps' for the rest.">
-    {COUNT, plural,
-     =0 {None}
-     =1 {<ph name="APP_1">$1<ex>Gmail</ex></ph>}
-     =2 {<ph name="APP_1">$1<ex>Gmail</ex></ph> and <ph name="APP_2">$2<ex>Youtube</ex></ph>}
-     =3 {<ph name="APP_1">$1<ex>Gmail</ex></ph>, <ph name="APP_2">$2<ex>Youtube</ex></ph>, and <ph name="APP_3">$3<ex>Calendar</ex></ph>}
-     =4 {<ph name="APP_1">$1<ex>Gmail</ex></ph>, <ph name="APP_2">$2<ex>Youtube</ex></ph>, <ph name="APP_3">$3<ex>Calendar</ex></ph>, and 1 other app}
-     other {<ph name="APP_1">$1<ex>Gmail</ex></ph>, <ph name="APP_2">$2<ex>Youtube</ex></ph>, <ph name="APP_3">$3<ex>Calendar</ex></ph>, and <ph name="EXTRA_APPS">$4<ex>4</ex></ph> other apps}}
-  </message>
-  <message name="IDS_APP_MANAGEMENT_APP_LIST_TITLE" desc="Title of app list card on main app management page.">
-    Manage your apps
-  </message>
-  <message name="IDS_APP_MANAGEMENT_BACK" desc="Label for button for going back to the previous page.">
-    Back
-  </message>
   <message name="IDS_APP_MANAGEMENT_CAMERA" desc="Label for the camera permission toggle.">
     Camera
   </message>
-  <message name="IDS_APP_MANAGEMENT_EXTENSIONS_SETTINGS" desc="Label for the open Extensions settings button on the Chrome app permissions page.">
-    Open Extensions settings
-  </message>
-  <message name="IDS_APP_MANAGEMENT_LESS_APPS" desc="Label for showing less apps.">
-    Show less
-  </message>
   <message name="IDS_APP_MANAGEMENT_LOCATION" desc="Label for the location permission toggle.">
     Location
   </message>
   <message name="IDS_APP_MANAGEMENT_MICROPHONE" desc="Label for the microphone permission toggle.">
     Microphone
   </message>
-  <message name="IDS_APP_MANAGEMENT_MORE_APPS" desc="Label for more apps button at bottom of app list card.">
-    Show <ph name="NUMBER_OF_MORE_APPS">$1<ex>4</ex></ph> more apps
-  </message>
   <message name="IDS_APP_MANAGEMENT_NO_APPS_FOUND" desc="Text shown when a search of apps yeilds no results.">
     No apps found
   </message>
   <message name="IDS_APP_MANAGEMENT_NOTIFICATIONS" desc="Label for notifications section in the app settings page.">
     Notifications
   </message>
-  <message name="IDS_APP_MANAGEMENT_NOTIFICATIONS_SUBLABEL" desc="Sublabel for the Notifications item in the main App Management view">
-    <ph name="NUMBER_OF_MORE_APPS">$1<ex>4</ex></ph> apps
-  </message>
   <message name="IDS_APP_MANAGEMENT_PERMISSIONS" desc="Label for permissions section in the app settings page.">
     Permissions
   </message>
   <message name="IDS_APP_MANAGEMENT_MORE_SETTINGS" desc="Label for a link to more settings and permissions for an app.">
     More settings and permissions
   </message>
-  <message name="IDS_APP_MANAGEMENT_THIS_APP_CAN" desc="Label for permissions that a Chrome app can use.">
-    This app can:
-  </message>
   <message name="IDS_APP_MANAGEMENT_PIN_TO_SHELF" desc="Label for the pin to shelf button in the app settings page.">
     Pin to shelf
   </message>
   <message name="IDS_APP_MANAGEMENT_SEARCH_PROMPT" desc="Prompt in search bar of main app management page.">
     Search apps
   </message>
-  <message name="IDS_APP_MANAGEMENT_SITE_SETTING" desc="Label for the open site settings for PWA app settings page.">
-    Open site settings
-  </message>
-  <message name="IDS_APP_MANAGEMENT_TITLE" desc="Title of the app management page.">
-    Apps
-  </message>
-  <message name="IDS_APP_MANAGEMENT_SIZE" desc="Label for the size of an app in the app settings page.">
-    Size: <ph name="APP_SIZE">$1<ex>8.0MB</ex></ph>
-  </message>
   <message name="IDS_APP_MANAGEMENT_UNINSTALL_APP" desc="Label for the uninstall button in the app settings page.">
     Uninstall
   </message>
-  <message name="IDS_APP_MANAGEMENT_VERSION" desc="Label for version of an app in the app settings page.">
-    Version: <ph name="VERSION">$1<ex>4.0</ex></ph>
-  </message>
-  <message name="IDS_APP_MANAGEMENT_PIN_ENFORCED_BY_POLICY" desc="Short text for the pin/unpin context menu to tell user the setting is enforced by policy of an app.">
-    Pinned by administrator
-  </message>
   <message name="IDS_APP_MANAGEMENT_CONTACTS" desc="Label for the Android contacts (address book) permission toggle.">
     Contacts
   </message>

chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/arc_permission_view.html

@@ -21,7 +21,8 @@
       </app-management-pin-to-shelf-item>
       <app-management-permission-item id="notifications-card"
         class="permission-card-row separated-row header-text"
-        permission-label="$i18n{notifications}" permission-type="NOTIFICATIONS"
+        permission-label="$i18n{appManagementNotificationsLabel}"
+        permission-type="NOTIFICATIONS"
         hidden$="[[!isArcSupported_]]">
       </app-management-permission-item>
       <div id="permissions-card"
@@ -30,32 +31,32 @@
         <div id="subpermission-expand-row"
           class="permission-section-header"
           hidden$="[[!isArcSupported_]]">
-          <div class="header-text">$i18n{permissions}</div>
+          <div class="header-text">$i18n{appManagementPermissionsLabel}</div>
         </div>
         <div class="permission-list indented-permission-block">
           <app-management-permission-item class="subpermission-row"
             icon="app-management:location"
-            permission-label="$i18n{location}"
+            permission-label="$i18n{appManagementLocationPermissionLabel}"
             permission-type="LOCATION">
           </app-management-permission-item>
           <app-management-permission-item class="subpermission-row"
             icon="app-management:camera"
-            permission-label="$i18n{camera}"
+            permission-label="$i18n{appManagementCameraPermissionLabel}"
             permission-type="CAMERA">
           </app-management-permission-item>
           <app-management-permission-item class="subpermission-row"
             icon="app-management:microphone"
-            permission-label="$i18n{microphone}"
+            permission-label="$i18n{appManagementMicrophonePermissionLabel}"
             permission-type="MICROPHONE">
           </app-management-permission-item>
           <app-management-permission-item class="subpermission-row"
             icon="app-management:contacts"
-            permission-label="$i18n{contacts}"
+            permission-label="$i18n{appManagementContactsPermissionLabel}"
             permission-type="CONTACTS">
           </app-management-permission-item>
           <app-management-permission-item class="subpermission-row"
             icon="app-management:storage"
-            permission-label="$i18n{storage}"
+            permission-label="$i18n{appManagementStoragePermissionLabel}"
             permission-type="STORAGE">
           </app-management-permission-item>
         </div>
@@ -63,7 +64,9 @@
       <div id="more-settings"
         class="permission-card-row separated-row header-text clickable"
         on-click="onClickNativeSettingsButton_">
-        <div id="label" class="header-text">$i18n{moreSettings}</div>
+        <div id="label" class="header-text">
+          $i18n{appManagementMoreSettingsLabel}
+        </div>
         <div class="permission-row-controls">
           <cr-icon-button class="native-settings-icon icon-external" role="link"
             tabindex="0" aria-labelledby="label">

chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/chrome_app_permission_view.html

@@ -18,10 +18,6 @@
         border-top: none;
       }
 
-      #pin-to-shelf-setting {
-        border-top: var(--card-separator);
-      }
-
     </style>
     <div>
       <div class="permission-list">
@@ -33,12 +29,12 @@
 
         <div id="permissions-card" class="permission-card-row">
           <div class="permission-section-header">
-            <div class="header-text">$i18n{permissions}</div>
+            <div class="header-text">$i18n{appManagementPermissionsLabel}</div>
           </div>
           <template is="dom-if" if="[[!hasPermissions_(messages_)]]">
             <div id="no-permissions" class="indented-permission-block">
               <div class="permission-text-row">
-                $i18n{appNoPermission}
+                $i18n{appManagementNoPermissions}
               </div>
             </div>
           </template>
@@ -75,7 +71,9 @@
           class="permission-card-row separated-row header-text clickable"
           on-click="onClickExtensionsSettingsButton_"
           hidden$="[[app_.hideMoreSettings]]">
-          <div id="label" class="header-text">$i18n{moreSettings}</div>
+          <div id="label" class="header-text">
+            $i18n{appManagementMoreSettingsLabel}
+          </div>
           <div class="permission-row-controls">
             <cr-icon-button class="native-settings-icon icon-external" role="link"
               tabindex="0" aria-labelledby="label">

chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/metadata_view.html

-<link rel="import" href="chrome://resources/html/polymer.html">
-
-<link rel="import" href="browser_proxy.html">
-<link rel="import" href="shared_style.html">
-<link rel="import" href="store_client.html">
-
-<dom-module id="app-management-metadata-view">
-  <template>
-    <style include="app-management-shared-css">
-    #shelf-switch-row {
-      align-items: center;
-      display: flex;
-      justify-content: space-around;
-      padding-bottom: 20px;
-    }
-
-    #shelf-switch {
-      align-items: center;
-      display: flex;
-      justify-content: space-between;
-    }
-
-    cr-toggle {
-      margin-inline-start: 12px;
-    }
-
-    #metadata-overview {
-      display: flex;
-      flex-direction: column;
-    }
-
-    #metadata-overview > span {
-      text-align: center;
-    }
-
-    .metadata-row {
-      display: flex;
-      justify-content: space-around;
-    }
-
-    #policy-indicator {
-      fill: var(--google-grey-refresh-700);
-      margin-inline-end: 12px;
-    }
-    </style>
-    <template is="dom-if" if="[[pinToShelfToggleVisible_(app_)]]">
-      <div id="shelf-switch-row">
-        <span id="shelf-switch" class="header-text">
-          <template is="dom-if" if="[[isPolicyPinned_(app_)]]">
-            <iron-icon id="policy-indicator" icon="cr:domain" tabindex="0"
-              aria-describedby="tooltip">
-            </iron-icon>
-            <paper-tooltip id="tooltip" for="policy-indicator"
-              position="top" fit-to-visible-bounds>
-              $i18n{pinControlledByPolicy}
-            </paper-tooltip>
-          </template>
-          $i18n{pinToShelf}
-          <cr-toggle id="pin-to-shelf-toggle" checked="[[isPinned_(app_)]]"
-            on-change="togglePinned_" disabled$="[[isPolicyPinned_(app_)]]">
-          </cr-toggle>
-        </span>
-      </div>
-    </template>
-
-    <div id="metadata-overview" class="secondary-text">
-      <span>[[versionString_(app_)]]</span>
-      <span>[[sizeString_(app_)]]</span>
-    </div>
-  </template>
-  <script src="metadata_view.js"></script>
-</dom-module>

chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/metadata_view.js

-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-Polymer({
-  is: 'app-management-metadata-view',
-
-  behaviors: [
-    app_management.StoreClient,
-  ],
-
-  properties: {
-    /** @type {App} */
-    app_: {
-      type: Object,
-    },
-  },
-
-  attached: function() {
-    this.watch('app_', state => app_management.util.getSelectedApp(state));
-    this.updateFromStore();
-  },
-
-  /**
-   * @param {App} app
-   * @return bool
-   * @private
-   */
-  pinToShelfToggleVisible_: function(app) {
-    return app.isPinned !== OptionalBool.kUnknown;
-  },
-
-  /**
-   * Returns a bool representation of the app's isPinned value, used to
-   * determine the position of the "Pin to Shelf" toggle.
-   * @param {App} app
-   * @return bool
-   * @private
-   */
-  isPinned_: function(app) {
-    return app.isPinned === OptionalBool.kTrue;
-  },
-
-  isPolicyPinned_: function(app) {
-    return app.isPolicyPinned === OptionalBool.kTrue;
-  },
-
-  /** @private */
-  togglePinned_: function() {
-    let newPinnedValue;
-
-    switch (this.app_.isPinned) {
-      case OptionalBool.kFalse:
-        newPinnedValue = OptionalBool.kTrue;
-        break;
-      case OptionalBool.kTrue:
-        newPinnedValue = OptionalBool.kFalse;
-        break;
-      default:
-        assertNotReached();
-    }
-
-    app_management.BrowserProxy.getInstance().handler.setPinned(
-        this.app_.id, assert(newPinnedValue));
-  },
-
-  /**
-   * @param {App} app
-   * @return {?string}
-   * @private
-   */
-  versionString_: function(app) {
-    if (!app.version) {
-      return null;
-    }
-
-    return loadTimeData.getStringF('version', assert(app.version));
-  },
-
-  /**
-   * @param {App} app
-   * @return {?string}
-   * @private
-   */
-  sizeString_: function(app) {
-    if (!app.size) {
-      return null;
-    }
-
-    return loadTimeData.getStringF('size', assert(app.size));
-  },
-});

chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/pin_to_shelf_item.html

@@ -10,7 +10,7 @@
     </style>
     <app-management-toggle-row
       id="toggle-row"
-      label="$i18n{pinToShelf}"
+      label="$i18n{appManagementPinToShelfLabel}"
       managed="[[isManaged_(app_)]]"
       value="[[getValue_(app_)]]">
     </app-management-toggle-row>

chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/pwa_permission_view.html

@@ -21,26 +21,27 @@
       </app-management-pin-to-shelf-item>
       <app-management-permission-item id="notifications-card"
         class="permission-card-row separated-row header-text"
-        permission-label="$i18n{notifications}"
+        permission-label="$i18n{appManagementNotificationsLabel}"
         permission-type="CONTENT_SETTINGS_TYPE_NOTIFICATIONS">
       </app-management-permission-item>
       <div id="permissions-card" class="permission-card-row">
         <div class="permission-section-header">
-          <div class="header-text">$i18n{permissions}</div>
+          <div class="header-text">$i18n{appManagementPermissionsLabel}</div>
         </div>
         <div class="permission-list indented-permission-block">
           <app-management-permission-item id="location"
             class="subpermission-row" icon="app-management:location"
-            permission-label="$i18n{location}"
+            permission-label="$i18n{appManagementLocationPermissionLabel}"
             permission-type="CONTENT_SETTINGS_TYPE_GEOLOCATION">
           </app-management-permission-item>
           <app-management-permission-item id="camera" class="subpermission-row"
-            icon="app-management:camera" permission-label="$i18n{camera}"
+            icon="app-management:camera"
+            permission-label="$i18n{appManagementCameraPermissionLabel}"
             permission-type="CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA">
           </app-management-permission-item>
           <app-management-permission-item id="microphone"
             class="subpermission-row" icon="app-management:microphone"
-            permission-label="$i18n{microphone}"
+            permission-label="$i18n{appManagementMicrophonePermissionLabel}"
             permission-type="CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC">
           </app-management-permission-item>
         </div>
@@ -48,7 +49,9 @@
       <div id="more-settings"
         class="permission-card-row separated-row header-text clickable"
         on-click="onClickSiteSettingsButton_">
-        <div id="label" class="header-text">$i18n{moreSettings}</div>
+        <div id="label" class="header-text">
+          $i18n{appManagementMoreSettingsLabel}
+        </div>
         <div class="permission-row-controls">
           <cr-icon-button class="native-settings-icon icon-external" role="link"
             tabindex="0" aria-labelledby="label">

chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/uninstall_button.html

@@ -25,15 +25,15 @@
       <cr-tooltip-icon
           id="policyIndicator"
           icon-class="cr20:domain"
-          tooltip-text="$i18n{policyAppUninstallPolicy}"
-          icon-aria-label="$i18n{policyAppUninstallPolicy}"
+          tooltip-text="$i18n{appManagementAppInstalledByPolicyLabel}"
+          icon-aria-label="$i18n{appManagementAppInstalledByPolicyLabel}"
           tooltip-position="bottom">
       </cr-tooltip-icon>
     </template>
     <template is="dom-if" if="[[showUninstallButton_(app_)]]">
       <cr-button id="uninstallButton" on-click="onClick_"
           disabled$="[[getDisableState_(app_)]]">
-        $i18n{uninstallApp}
+        $i18n{appManagementUninstallLabel}
       </cr-button>
     </template>
   </template>

chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc

@@ -648,33 +648,22 @@ void AddAppsStrings(content::WebUIDataSource* html_source) {
 
 void AddAppManagementStrings(content::WebUIDataSource* html_source) {
   static constexpr LocalizedString localized_strings[] = {
-      {"appListTitle", IDS_APP_MANAGEMENT_APP_LIST_TITLE},
-      {"appManagementSearchPrompt", IDS_APP_MANAGEMENT_SEARCH_PROMPT},
-      {"appNoPermission", IDS_APPLICATION_INFO_APP_NO_PERMISSIONS_TEXT},
-      {"camera", IDS_APP_MANAGEMENT_CAMERA},
-      {"contacts", IDS_APP_MANAGEMENT_CONTACTS},
-      {"controlledByPolicy", IDS_CONTROLLED_SETTING_POLICY},
-      {"lessApps", IDS_APP_MANAGEMENT_LESS_APPS},
-      {"location", IDS_APP_MANAGEMENT_LOCATION},
-      {"microphone", IDS_APP_MANAGEMENT_MICROPHONE},
-      {"moreApps", IDS_APP_MANAGEMENT_MORE_APPS},
-      {"moreSettings", IDS_APP_MANAGEMENT_MORE_SETTINGS},
+      {"appManagementAppInstalledByPolicyLabel",
+       IDS_APP_MANAGEMENT_POLICY_APP_POLICY_STRING},
+      {"appManagementCameraPermissionLabel", IDS_APP_MANAGEMENT_CAMERA},
+      {"appManagementContactsPermissionLabel", IDS_APP_MANAGEMENT_CONTACTS},
+      {"appManagementLocationPermissionLabel", IDS_APP_MANAGEMENT_LOCATION},
+      {"appManagementMicrophonePermissionLabel", IDS_APP_MANAGEMENT_MICROPHONE},
+      {"appManagementMoreSettingsLabel", IDS_APP_MANAGEMENT_MORE_SETTINGS},
       {"appManagementNoAppsFound", IDS_APP_MANAGEMENT_NO_APPS_FOUND},
-      {"notifications", IDS_APP_MANAGEMENT_NOTIFICATIONS},
-      {"notificationSublabel", IDS_APP_MANAGEMENT_NOTIFICATIONS_SUBLABEL},
-      {"openAndroidSettings", IDS_APP_MANAGEMENT_ANDROID_SETTINGS},
-      {"openExtensionsSettings", IDS_APP_MANAGEMENT_EXTENSIONS_SETTINGS},
-      {"openSiteSettings", IDS_APP_MANAGEMENT_SITE_SETTING},
-      {"permissions", IDS_APP_MANAGEMENT_PERMISSIONS},
-      {"pinControlledByPolicy", IDS_APP_MANAGEMENT_PIN_ENFORCED_BY_POLICY},
-      {"pinToShelf", IDS_APP_MANAGEMENT_PIN_TO_SHELF},
-      {"policyAppUninstallPolicy", IDS_APP_MANAGEMENT_POLICY_APP_POLICY_STRING},
-      {"size", IDS_APP_MANAGEMENT_SIZE},
-      {"storage", IDS_APP_MANAGEMENT_STORAGE},
-      {"thisAppCan", IDS_APP_MANAGEMENT_THIS_APP_CAN},
-      {"title", IDS_APP_MANAGEMENT_TITLE},
-      {"uninstallApp", IDS_APP_MANAGEMENT_UNINSTALL_APP},
-      {"version", IDS_APP_MANAGEMENT_VERSION},
+      {"appManagementNoPermissions",
+       IDS_APPLICATION_INFO_APP_NO_PERMISSIONS_TEXT},
+      {"appManagementNotificationsLabel", IDS_APP_MANAGEMENT_NOTIFICATIONS},
+      {"appManagementPermissionsLabel", IDS_APP_MANAGEMENT_PERMISSIONS},
+      {"appManagementPinToShelfLabel", IDS_APP_MANAGEMENT_PIN_TO_SHELF},
+      {"appManagementSearchPrompt", IDS_APP_MANAGEMENT_SEARCH_PROMPT},
+      {"appManagementStoragePermissionLabel", IDS_APP_MANAGEMENT_STORAGE},
+      {"appManagementUninstallLabel", IDS_APP_MANAGEMENT_UNINSTALL_APP},
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           base::size(localized_strings));