• Jiewei Qian's avatar
    Revert "ambient: handle suspend case better" · d6010a57
    Jiewei Qian authored
    This reverts commit 29736b94.
    
    Reason for revert: Tests are failing consistently in linux-chromeos-rel
    
    Sample failing jobs:
    [1] https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-rel/41574
    [2] https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-rel/41572
    
    Tried to reproduce locally, HasMaskLayerWithLongText fails 9 out of 10 times.
    
    Error message: 
    ../../ash/ambient/ui/media_string_view_unittest.cc:285: Failure
    Value of: GetMediaStringViewTextContainer()->layer()->layer_mask_layer()
      Actual: false
    Expected: true
    
    Original change's description:
    > ambient: handle suspend case better
    >
    > Previously ambient mode will trigger lockscreen on screen dimm and then
    > rely on lock screen idle to show screen saver. This works in some cases,
    > but in suspend case the time between screen dim and cpu suspend is too
    > short. Screen saver was not able to enguage. The reason we have the set
    > up is because the screen saver was sharing the same window constainer as
    > the lock screen, it cannot show before lock screen is ready.
    >
    > Now screen saver has its own window container, we changed the flow to
    > show ambient mode immediately when idle. This will prevent cpu suspend
    > because screen saver will take a wake lock if charging. Screen saver
    > will still lock the screen in the back if user reference indicated
    > lockscreen after wake.
    >
    > Bug: b:169442907
    > Test: unitests and manual tests
    > Change-Id: I1a5df2c58c976bba492c709e0a61dd5a6314d084
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2435334
    > Reviewed-by: Tao Wu <wutao@chromium.org>
    > Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
    > Cr-Commit-Position: refs/heads/master@{#812397}
    
    TBR=xiaohuic@chromium.org,wutao@chromium.org,cowmoo@chromium.org
    
    Change-Id: I307c11aed04801e6705be083dcaabfa2c5099802
    No-Presubmit: true
    No-Tree-Checks: true
    No-Try: true
    Bug: b:169442907
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440326Reviewed-by: default avatarJiewei Qian  <qjw@chromium.org>
    Commit-Queue: Jiewei Qian  <qjw@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#812549}
    d6010a57
ambient_ui_model.h 2.17 KB