CCA: Hide PTZ button into expert mode

Bug: b/185196105 Test: Manually see if the PTZ button only shown when expert mode options are on. Change-Id: I9fb28454639291ce93a6795579c5eae1397bee8d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2822584 Commit-Queue: Inker Kuo <inker@chromium.org> Auto-Submit: Inker Kuo <inker@chromium.org> Reviewed-by: Shik Chen <shik@chromium.org> Cr-Commit-Position: refs/branch-heads/4472@{#53} Cr-Branched-From: 3d60439-refs/heads/master@{#870763}
chromium · Apr 14, 2021 · 74758f6 · 74758f6
1 parent 1116daf
commit 74758f6
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 3 deletions.
diff --git a/chromeos/components/camera_app_ui/resources.h b/chromeos/components/camera_app_ui/resources.h
@@ -64,6 +64,7 @@ const struct {
     {"expert_save_metadata", IDS_EXPERT_SAVE_METADATA},
     {"expert_print_performance_logs", IDS_EXPERT_PRINT_PERFORMANCE_LOGS},
     {"expert_scan_barcode", IDS_EXPERT_SCAN_BARCODE},
+    {"expert_show_ptz_options", IDS_EXPERT_SHOW_PTZ_OPTIONS},
     {"expert_custom_video_parameters", IDS_EXPERT_CUSTOM_VIDEO_PARAMETERS},
     {"tilt_up_button", IDS_TILT_UP_BUTTON},
     {"pan_right_button", IDS_PAN_RIGHT_BUTTON},

diff --git a/chromeos/components/camera_app_ui/resources/css/main.css b/chromeos/components/camera_app_ui/resources/css/main.css
@@ -665,7 +665,7 @@ body.max-wnd #options-group {
   margin: var(--option-item-vpadding) 0;
 }
 
-body:not(.has-ptz-support) #open-ptz-panel {
+body:is(:not(.has-ptz-support), :not(.expert), :not(.show-ptz-options)) #open-ptz-panel {
   display: none;
 }
 

diff --git a/chromeos/components/camera_app_ui/resources/css/ptz_toast.css b/chromeos/components/camera_app_ui/resources/css/ptz_toast.css
@@ -7,7 +7,7 @@
   background-color: rgb(26, 115, 232);
   border-radius: 20px;
   color: white;
-  display: flex;
+  display: none;
   height: 42px;
   padding: 0 12px;
   position: absolute;

diff --git a/chromeos/components/camera_app_ui/resources/js/state.js b/chromeos/components/camera_app_ui/resources/js/state.js
@@ -54,6 +54,7 @@ export const State = {
   SCAN_BARCODE: 'scan-barcode',
   SHOULD_HANDLE_INTENT_RESULT: 'should-handle-intent-result',
   SHOW_METADATA: 'show-metadata',
+  SHOW_PTZ_OPTIONS: 'show-ptz-options',
   SCREEN_OFF_AUTO: 'screen-off-auto',
   STREAMING: 'streaming',
   SUSPEND: 'suspend',

diff --git a/chromeos/components/camera_app_ui/resources/js/views/camera.js b/chromeos/components/camera_app_ui/resources/js/views/camera.js
@@ -363,14 +363,17 @@ export class Camera extends View {
   }
 
   /**
+   * @suppress {uselessCode} For skip highlighting PTZ button code.
    * @private
    */
   initOpenPTZPanel_() {
     this.openPTZPanel_.addEventListener('click', () => {
       nav.open(ViewName.PTZ_PANEL, this.preview_.stream);
-      highlight(false);
     });
 
+    // Skip highlight effect on R91 release.
+    return;
+    /* eslint-disable no-unreachable */
     // Highlight effect for PTZ button.
     const highlight = (enabled) => {
       this.ptzToast_.classList.toggle('hidden', !enabled);
@@ -399,6 +402,7 @@ export class Camera extends View {
       this.ptzToast_.style.left = `${right + 20}px`;
       highlight(true);
     });
+    /* eslint-enabled no-unreachable */
   }
 
   /**

diff --git a/chromeos/components/camera_app_ui/resources/strings/camera_strings.grd b/chromeos/components/camera_app_ui/resources/strings/camera_strings.grd
@@ -317,6 +317,9 @@
       <message desc="Label for snackbar message when a link is copied" name="IDS_SNACKBAR_TEXT_COPIED">
         Text copied
       </message>
+      <message desc="Label for expert mode option: show camera pan/tilt/zoom options." name="IDS_EXPERT_SHOW_PTZ_OPTIONS">
+        Show pan tilt zoom options
+      </message>
       <message desc="Label for tilt up camera preview" name="IDS_TILT_UP_BUTTON">
         Tilt up
       </message>

diff --git a/...s/camera_app_ui/resources/strings/camera_strings_grd/IDS_EXPERT_SHOW_PTZ_OPTIONS.png.sha1 b/...s/camera_app_ui/resources/strings/camera_strings_grd/IDS_EXPERT_SHOW_PTZ_OPTIONS.png.sha1
@@ -0,0 +1 @@
+0b8a9fa99e9ae409882295f1ff4894be5d5fd02d
diff --git a/chromeos/components/camera_app_ui/resources/views/main.html b/chromeos/components/camera_app_ui/resources/views/main.html
@@ -457,6 +457,13 @@
                  data-key="printPerformanceLogs">
           <span i18n-text="expert_print_performance_logs"></span>
         </label>
+        <label class="menu-item">
+          <input class="icon" id="expert-show-ptz-options"
+                 type="checkbox" tabindex="0"
+                 data-state="show-ptz-options"
+                 data-key="showPtzOptions">
+          <span i18n-text="expert_show_ptz_options"></span>
+        </label>
         <label class="menu-item">
           <input class="icon" id="custom-video-parameters"
                  type="checkbox" tabindex="0"