Multi-pod support for lock screen.

ui/login/account_picker/user_pod_row.js

 // Copyright 2014 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.
 
 /**
  * @fileoverview User pod row implementation.
  */
 
 cr.define('login', function() {
   /**
@@ skipping 41 matching lines @@
   var DESKTOP_POD_WIDTH = 180;
   var MD_DESKTOP_POD_WIDTH = 160;
   var PUBLIC_EXPANDED_BASIC_WIDTH = 500;
   var PUBLIC_EXPANDED_ADVANCED_WIDTH = 610;
   var CROS_POD_HEIGHT = 213;
   var DESKTOP_POD_HEIGHT = 226;
   var MD_DESKTOP_POD_HEIGHT = 200;
   var POD_ROW_PADDING = 10;
   var DESKTOP_ROW_PADDING = 32;
   var CUSTOM_ICON_CONTAINER_SIZE = 40;
+  var CROS_PIN_POD_WIDTH = 270;
+  var CROS_PIN_POD_HEIGHT = 594;
+  var PIN_EXTRA_WIDTH = 90;
 
   /**
    * Minimal padding between user pod and virtual keyboard.
    * @type {number}
    * @const
    */
   var USER_POD_KEYBOARD_MIN_PADDING = 20;
 
   /**
    * Maximum time for which the pod row remains hidden until all user images
@@ skipping 756 matching lines @@
     },
 
     /**
      * Height number of pixels.
      */
     get height() {
       return this.offsetHeight;
     },
 
     /**
-     * Gets the authorization element of the pod.
-     * @type {!HTMLDivElement}
-     */
-    get authElement() {
-      return this.querySelector('.auth-container');
-    },
-
-    /**
-     * Gets image pane element.
-     * @type {!HTMLDivElement}
-     */
-    get imagePaneElement() {
-      return this.querySelector('.user-image-pane');
-    },
-
-    /**
      * Gets image element.
      * @type {!HTMLImageElement}
      */
     get imageElement() {
       return this.querySelector('.user-image');
     },
 
     /**
      * Gets name element.
      * @type {!HTMLDivElement}
@@ skipping 29 matching lines @@
     /**
      * Gets the password label, which is used to show a message where the
      * password field is normally.
      * @type {!HTMLInputElement}
      */
     get passwordLabelElement() {
       return this.querySelector('.password-label');
     },
 
     /**
-     * Gets the pin-container of the pod.
-     * @type {!HTMLDivElement}
-     */
-    get pinContainer() {
-      return this.querySelector('.pin-container');
-    },
-
-    /**
      * Gets the pin-keyboard of the pod.
      * @type {!HTMLElement}
      */
     get pinKeyboard() {
       return this.querySelector('pin-keyboard');
     },
 
     /**
      * Gets user online sign in hint element.
      * @type {!HTMLDivElement}
      */
     get reauthWarningElement() {
       return this.querySelector('.reauth-hint-container');
     },
 
     /**
-     * Gets the signed in indicator of the pod.
-     * @type {!HTMLDivElement}
-     */
-    get signInElement() {
-      return this.querySelector('.signed-in-indicator');
-    },
-
-    /**
      * Gets the container holding the launch app button.
      * @type {!HTMLButtonElement}
      */
     get launchAppButtonContainerElement() {
       return this.querySelector('.launch-app-button-container');
     },
 
     /**
      * Gets launch app button.
      * @type {!HTMLButtonElement}
@@ skipping 185 matching lines @@
       } else if (this.user_.isApp) {
         this.setUserPodIconType('app');
       }
     },
 
     toggleTransitions: function(enable) {
       this.classList.toggle('flying-pin-pod', enable);
     },
 
     setPinVisibility: function(visible) {
-      var elements = [this, this.authElement, this.imagePaneElement,
-                      this.imageElement, this.pinContainer];
+      var elements = this.querySelectorAll('.pin-modifiable');

[jdufault, 2016/07/12 19:51:26]

What about

  var elements = Array(this.querySelectorAll('.pin-modifiable'))

I think a DOMList also exposes a 'length' property and supports indexing, so you
could iterate the return value directly. The only issue is the
elements_array.push(this) bit.

Does getElementsByClassName work?

What about 'pin-status-tag' or 'pin-tag' instead of 'pin-modifiable'?

[sammiequon, 2016/07/12 23:20:18]

Array() seems to make an array of arrays where the first element is the array
and the rest are undefined.

Done.

Done.

[jdufault, 2016/07/12 23:37:46]

Okay - how about just making a helper function then that toggles the pin state?

  function setPinClass(element, enabled) {
    element.classList.toggle('pin-enabled', enabled);
    element.classList.toggle('pin-disabled', !enabled);
  }


  setPinClass(this, visible)
  for (...)
    setPinClass(element, visible)

[sammiequon, 2016/07/16 01:48:48]

Done.

+      var elements_array = Array.prototype.slice.call(elements);
+      elements_array.push(this);
 
-      for (var idx = 0; idx < elements.length; idx++) {
-        var currentElement = elements[idx];
+      for (var idx = 0; idx < elements_array.length; idx++) {
+        var currentElement = elements_array[idx];
         currentElement.classList.toggle('pin-enabled', visible);
         currentElement.classList.toggle('pin-disabled', !visible);
       }
 
       // Set the focus to the input element after showing/hiding pin keyboard.
       if (visible)
         this.pinKeyboard.focus();
       else
         this.mainInput.focus();
     },
@@ skipping 1417 matching lines @@
     togglePinTransitions: function(enable) {
       for (var i = 0; i < this.pods.length; ++i)
         this.pods[i].toggleTransitions(enable);
     },
 
     setFocusedPodPinVisibility: function(visible) {
       if (this.focusedPod_ && this.focusedPod_.user.showPin)
         this.focusedPod_.setPinVisibility(visible);
     },
 
+    isPinShown_: function() {
+      for (var i = 0; i < this.pods.length; ++i) {
+        if (this.pods[i].classList.contains('pin-enabled'))

[jdufault, 2016/07/12 19:51:26]

This class check is happening in a couple of places, right? I think it'd make
sense to add a helper method that does it.

[sammiequon, 2016/07/12 23:20:18]

Done. I think the other check is in another CL though.

[jdufault, 2016/07/12 23:37:46]

Okay - please make sure you update that CL as well. You can make that other
patch set depend on this one.

[sammiequon, 2016/07/16 01:48:48]

Done.

+          return true;
+      }
+      return false;
+    },
+
     /**
      * Runs app with a given id from the list of loaded apps.
      * @param {!string} app_id of an app to run.
      * @param {boolean=} opt_diagnosticMode Whether to run the app in
      *     diagnostic mode. Default is false.
      */
     findAndRunAppForTesting: function(app_id, opt_diagnosticMode) {
       var app = this.getPodWithAppId_(app_id);
       if (app) {
         var activationEvent = cr.doc.createEvent('MouseEvents');
@@ skipping 410 matching lines @@
       var layout = this.calculateLayout_();
       var columns = this.columns = layout.columns;
       var rows = this.rows = layout.rows;
       var maxPodsNumber = columns * rows;
       var margin = isDesktopUserManager ? DESKTOP_MARGIN_BY_COLUMNS[columns] :
                                           MARGIN_BY_COLUMNS[columns];
       this.parentNode.setPreferredSize(
           this.columnsToWidth_(columns), this.rowsToHeight_(rows));
       var height = this.userPodHeight_;
       var width = this.userPodWidth_;
+
+      var pinShownRow = maxPodsNumber + 1;
+      var pinShownColumn = maxPodsNumber + 1;
+      var podWithPin = this.focusedPod_;
+
+      if (this.isPinShown_()) {
+        this.pods.forEach(function(pod, index) {
+          var column = index % columns;
+          var row = Math.floor(index / columns);
+          if (pod == podWithPin) {
+            pinShownRow = row;
+            pinShownColumn = column;
+          }
+        });
+      }
+
       this.pods.forEach(function(pod, index) {
         if (index >= maxPodsNumber) {
            pod.hidden = true;
            return;
         }
         pod.hidden = false;
-        if (pod.offsetHeight != height) {
+        if (pod.offsetHeight != height &&
+            pod.offsetHeight != CROS_PIN_POD_HEIGHT) {

[jdufault, 2016/07/12 19:51:26]

Can we just set height/width to the expected values instead of forking the
logic?

[sammiequon, 2016/07/12 23:20:18]

The height/width is being set in another function based on whether it is CrOS or
desktop and I guess this is too check that the pods are the right size. I didn't
know exactly what this is for so I just added a extra check because sometimes
the pod is expanded for the pin.

[jdufault, 2016/07/12 23:37:46]

It's probably worthwhile to investigate then to make sure we're doing the right
thing.

           console.error('Pod offsetHeight (' + pod.offsetHeight +
               ') and POD_HEIGHT (' + height + ') are not equal.');
         }
-        if (pod.offsetWidth != width) {
+        if (pod.offsetWidth != width &&
+            pod.offsetWidth != CROS_PIN_POD_WIDTH) {
           console.error('Pod offsetWidth (' + pod.offsetWidth +
               ') and POD_WIDTH (' + width + ') are not equal.');
         }
         var column = index % columns;
         var row = Math.floor(index / columns);
+        var pinPadding = 0;
+        if (row == pinShownRow) {
+          pinPadding = PIN_EXTRA_WIDTH / 2;
+          if (column <= pinShownColumn)
+            pinPadding *= -1;

[jdufault, 2016/07/12 19:51:26]

We want negative padding?

[sammiequon, 2016/07/12 23:20:18]

I renamed it offsetFromPin. The pods on the left of the pod showing the pin add
a negative offset.

+        }
+
         var rowPadding = isDesktopUserManager ? DESKTOP_ROW_PADDING :
                                                 POD_ROW_PADDING;
-        pod.left = rowPadding + column * (width + margin);
+        pod.left = rowPadding + column * (width + margin) + pinPadding;
 
         // On desktop, we want the rows to always be equally spaced.
         pod.top = isDesktopUserManager ? row * (height + rowPadding) :
                                          row * height + rowPadding;
       });
       Oobe.getInstance().updateScreenSize(this.parentNode);
     },
 
     /**
      * Number of columns.
@@ skipping 50 matching lines @@
       }
       this.insideFocusPod_ = true;
 
       for (var i = 0, pod; pod = this.pods[i]; ++i) {
         if (!this.alwaysFocusSinglePod) {
           pod.isActionBoxMenuActive = false;
         }
         if (pod != podToFocus) {
           pod.isActionBoxMenuHovered = false;
           pod.classList.remove('focused');
+          pod.setPinVisibility(false);
           // On Desktop, the faded style is not set correctly, so we should
           // manually fade out non-focused pods if there is a focused pod.
           if (pod.user.isDesktopUser && podToFocus)
             pod.classList.add('faded');
           else
             pod.classList.remove('faded');
           pod.reset(false);
         }
       }
 
       // Clear any error messages for previous pod.
       if (!this.isFocused(podToFocus))
         Oobe.clearErrors();
 
       var hadFocus = !!this.focusedPod_;
       this.focusedPod_ = podToFocus;
       if (podToFocus) {
+        this.setFocusedPodPinVisibility(true);
         podToFocus.classList.remove('faded');
         podToFocus.classList.add('focused');
         if (!podToFocus.multiProfilesPolicyApplied) {
           podToFocus.classList.toggle('signing-in', false);
           if (!opt_skipInputFocus)
             podToFocus.focusInput();
         } else {
           podToFocus.userTypeBubbleElement.classList.add('bubble-shown');
           // Note it is not necessary to skip this focus request when
           // |opt_skipInputFocus| is true. When |multiProfilesPolicyApplied|
           // is false, it doesn't focus on the password input box by default.
           podToFocus.focus();
         }
 
         // focusPod() automatically loads wallpaper
         if (!podToFocus.user.isApp)
           chrome.send('focusPod', [podToFocus.user.username]);
         this.firstShown_ = false;
         this.lastFocusedPod_ = podToFocus;
         this.scrollFocusedPodIntoView();
       }
       this.insideFocusPod_ = false;
+      this.placePods_();
     },
 
     /**
      * Resets wallpaper to the last active user's wallpaper, if any.
      */
     loadLastWallpaper: function() {
       if (this.lastFocusedPod_ && !this.lastFocusedPod_.user.isApp)
         chrome.send('loadWallpaper', [this.lastFocusedPod_.user.username]);
     },
 
@@ skipping 361 matching lines @@
        if (pod && pod.multiProfilesPolicyApplied) {
          pod.userTypeBubbleElement.classList.remove('bubble-shown');
        }
      }
   };
 
   return {
     PodRow: PodRow
   };
 });