Merge "Switch to small clock in split shade in certain edge scenarios" into udc-dev

        }

    }

    /**

     * Returns true if the large clock will block the notification shelf in AOD

     */

    public boolean isLargeClockBlockingNotificationShelf() {

        ClockController clock = mKeyguardClockSwitchController.getClock();

        return clock != null && clock.getLargeClock().getConfig().getHasCustomWeatherDataDisplay();

    }

    /**

     * Updates the alignment of the KeyguardStatusView and animates the transition if requested.

     */

            // When media is visible, it overlaps with the large clock. Use small clock instead.

            return SMALL;

        }

        // To prevent the weather clock from overlapping with the notification shelf on AOD, we use

        // the small clock here

        if (mKeyguardStatusViewController.isLargeClockBlockingNotificationShelf()

                && hasVisibleNotifications() && isOnAod()) {

            return SMALL;

        }

        return LARGE;

    }