Commit Graph

76 Commits

Author SHA1 Message Date
Beverly
65009983be Add additional debug logs to clock view
Test: manually check logcat
Bug: 222260948
Change-Id: Iadc00b1140bd72c72f0119f15f619e6de22ae316
2022-03-24 21:38:31 +00:00
Josh Tsuji
32354d952b Adds Launcher in-window animations, and reworks how the unlock flow works.
Bug: 197636887
Test: atest SystemUITests
Change-Id: If6ff114f90fcfc19b9e3530bb0dea8cc0591f745
2022-01-18 17:41:28 -05:00
Matt Pietal
bbf95880ff Merge "Legacy smartspace alignment fixes" into sc-v2-dev am: 65d19ed043 am: 05305a93c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16467929

Change-Id: I3b1a7321666275964b6042043bfe92a7a293f3e3
2021-12-15 18:21:23 +00:00
Matt Pietal
62e224407d Legacy smartspace alignment fixes
If newer smartspace content is not enabled, the title alignment and
burn-in placement of legacy smartspace is incorrect. Align to the
start.

Fixes: 210090859
Test: manual, play music and disable new smartspace

Change-Id: Id038290100b9bc254d6060cb163b0fe772518018
2021-12-14 11:15:31 -05:00
TreeHugger Robot
24a379c92f Merge "Update clock location" into sc-v2-dev am: bda966d4d0 am: b4f39650a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16457712

Change-Id: I551726bc137a67472f5e7c7a06860e0810c014db
2021-12-14 00:59:05 +00:00
Matt Pietal
5a251be21f Update clock location
If smartspace, the large clock would overlap with UDFPS content. Make
sure the negative margin gets applied in all cases. Make slight
adjustments to the margin.

Bug: 209864593
Test: manual, oriole + all display sizes
Change-Id: Ibacdc777a8a1d6bcf9324cc12871fc6662a3d5c4
2021-12-13 14:31:39 -05:00
TreeHugger Robot
80a49a081f Merge "Fold to AOD animation: part 2, add fold to aod controller" 2021-12-13 17:58:24 +00:00
Nick Chameyev
418683f500 Fold to AOD animation: part 2, add fold to aod controller
Adds animation that animates AOD content
from left to right when folding a foldable
device.

There are still a couple of issue that should be
addressed in the follow up CLs:
* Navigation bar handle sometimes displayed on AOD
* Showing keyguard when folding from unlocked state
sometimes takes too much time so the screen blocker
times out which leads to flickering

Bug: 202844967
Test: fold from lockscreen, fold from unlocked device,
 aod enabled/disabled, gesture nav enabled/disabled
Test: screen off animation when unlocked
Test: screen off animation when locked
Test: screen off animation when timed out
Test: fingerprint unlock from aod
Change-Id: Ie44f82119ac770ce34faecc60402044d4109dddf
2021-12-13 15:30:29 +00:00
Michal Brzezinski
af3f020b35 Centering big clock vertically on large screen lockscreen and AOD
Big clock was not centered vertically properly in case we don't support smartspace on the device. When smartspace is not present big clock's height is wrap_content and that makes it (and all parent views) takes much less space. Then even though clock might be centered in parent, parent is not centered on the screen so it doesn't change much.
This change is making it always go match_parent, that is (more or less) full height of the screen.

Fixes: 209013448
Test: manual
Change-Id: I721b5750ae34d204c6eb0bdb7edca6aa12e3a88b
2021-12-10 18:03:35 +00:00
Matt Pietal
6f341cd95c Allow a settings override for double-line clock
This setting allows users to always show a single-line format clock,
regardless of notification status.

Fixes: 194905512
Test: atest KeyguardClockSwitchControllerTest
Change-Id: I77269988447fc5732ff6b8774654ce4bf9c026de
2021-11-17 19:26:26 +00:00
Matt Pietal
9688ad33e7 [DO NOT MERGE] Allow a settings override for double-line clock
This setting allows users to always show a single-line format clock,
regardless of notification status.

Fixes: 194905512
Test: atest KeyguardClockSwitchControllerTest
Change-Id: I77269988447fc5732ff6b8774654ce4bf9c026de
2021-11-17 13:31:26 +00:00
Beverly
392d8686a9 Add a bold-text version for the keyguard clock
Test: manual (Settings > A11y > Text and display > Bold text)
Test: atest AnimatableClockControllerTest
Fixes: 201034059
Change-Id: I656afac3ee22e79a0bf218803699ab5182c34c66
2021-11-11 14:01:39 -05:00
Matt Pietal
648a020480 Don't register multiple predraw listeners
Also make sure they are removed properly when the view becomes
detached.

Fixes: 203257107
Test: atest KeyguardClockSwitchControllerTest

Change-Id: Ied4d4e7774d15af71648b188ac723c9c7635f506
2021-10-20 11:30:19 -04:00
Matt Pietal
b03823f4dc AOD - Notif icon location
Support a mode where icons are visible on AOD with the large
clock. This means shifting both smartspace and icons when switching
between large/small clocks.

Also: Continue to remove old keyguard flag
Also: Add a couple logs for smartspace, let
LockscreenSmartspaceController handle disconnect directly

Fixes: 201548040
Test: atest KeyguardClockSwitchControllerTest KeyguardSliceViewTest KeyguardUpdateMonitorTest KeyguardStatusViewControllerTest
Change-Id: I3697aea0c1a8083e87d446d082d95aab573af83a
2021-10-14 11:56:53 +00:00
Beverly Tai
385e707260 Merge "Update dozing state on clock view attached" into sc-qpr1-dev am: f841ce4725
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15993367

Change-Id: I9cdc74eb37fc0efaa14b47d93b1293639e41ba25
2021-10-06 17:49:50 +00:00
Beverly
3fac0854c2 Update dozing state on clock view attached
Else, the clock may animate in at the wrong font weight.

Test: atest AnimatableClockControllerTest
Test: manually swipe away all notifications on LS,
see the large clock animate in at full font weight
Fixes: 201615075

Change-Id: I139e5a5c88551f23f99decff3e7ffc8bdaa5bba4
2021-10-06 14:09:39 +00:00
Beverly
3a7d2e55a6 Update clock burn-in so it doesn't clash with udpfs
* update the UDFPS icon burn-in parameters to be in pixels
because we don't want display density to increase the
position movement
* when the clock is centered aligned, we want to make sure
it doesn't overlap with the udfps icon

Test: atest SystemUITests, manually update clock times with
with DozeUi.BURN_IN_TESTING_ENABLED enabled and see clock
doesn't interfere with the UDFPS icon.
Fixes: 192423460

Change-Id: I6f95fe3ad763971b804129b517f4c98192ab3674
Merged-In: I6f95fe3ad763971b804129b517f4c98192ab3674
2021-09-27 12:30:33 +00:00
Beverly
9b62051f88 Update clock burn-in so it doesn't clash with udpfs
* update the UDFPS icon burn-in parameters to be in pixels
because we don't want display density to increase the
position movement
* when the clock is centered aligned, we want to make sure
it doesn't overlap with the udfps icon

Test: atest SystemUITests, manually update clock times with
with DozeUi.BURN_IN_TESTING_ENABLED enabled and see clock
doesn't interfere with the UDFPS icon.
Fixes: 192423460

Change-Id: I6f95fe3ad763971b804129b517f4c98192ab3674
2021-09-17 17:48:25 +00:00
Matt Pietal
b9b97ec9d4 [DO NOT MERGE] Support multiple smartspace views
Previously, a singleton view was reused in multiple places. However,
this does not work when multiple displays are in use, such as when
casting the device display to another screen. Supports sets of views
that are activated when they are attached to windows, and removed when
they are detached.

Fixes: 196175396
Test: atest LockscreenSmartspaceControllerTest
Change-Id: Ied1ecff9103d8539f075785409d2951a1be21ab2
2021-08-25 16:06:40 -04:00
Michał Brzeziński
fdaaa7d1f3 Revert "Moving smartspace to the right on the lockscreen for split shade"
This reverts commit d04b85a037.

Reason for revert: UX decision on smartspace positioning was reverted
Bug: 197624854
Bug: 196977150

Change-Id: I6247289495d39c7f216d90a7de5227b9daa56a44
Merged-In: I6247289495d39c7f216d90a7de5227b9daa56a44
2021-08-24 19:25:58 +01:00
Neha Jain
de25146d1c Merge "Limit keyguard views on alt displays" into sc-dev am: b3deaf2b6d am: dcb1cbfcfb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15547527

Change-Id: I67521d43a083bc0dab4b5666e3eb35914d5be144
2021-08-13 19:14:56 +00:00
Matt Pietal
893286a5d4 Limit keyguard views on alt displays
When casting or on other displays, the keyguard has always limited the
information shown when locked. Don't show the smartspace and icons on
these alternate displays

Fixes: 196175396
Test: manual (cast to nest display device)
Change-Id: Ied1ecff9103d8539f075785409d2951a1be21ab2
2021-08-12 18:26:15 -04:00
Michal Brzezinski
8afdd40f0e Moving smartspace to the right on the lockscreen for split shade
There is a new view managed by ConstraintLayout guidelines that serves as container for smartspace and is placed on the right.
It's visible only in split shade and then it contains Smartspace. Smartspace view is switching between the default (current) view container and the new split shade container.
Switching Smartspace view and visibility of its containers is managed by LockscreenSmartspaceController.

Bug: 193654214
Test: KeyguardClockSwitchControllerTest, LockscreenSmartspaceControllerTest, KeyguardClockPositionAlgorithmTest
Change-Id: I1afcdf7f3c750c36b995f1d6fd9d4393eee8cbef
Merged-In: I1afcdf7f3c750c36b995f1d6fd9d4393eee8cbef
2021-08-04 11:59:42 +01:00
Beverly Tai
857a5a2b36 Merge "Bring back time formatting for single line clock" into sc-dev am: 67e353d818
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15192039

Change-Id: I0a2b6289008be559afa67fb318857ec25650f44f
2021-07-07 21:00:45 +00:00
Beverly
4812dfbc62 Bring back time formatting for single line clock
Use old date format for the single line clock, so that we now
support (for single line clock) different clock representations.
For example, French Canadian uses an h instead of a colon
(13 h 01 instead of 13:01).

Test: manual
Bug: 186726401
Fixes: 191761465
Change-Id: If97a49780029f24dc99625a310729630b69e7a68
2021-07-07 20:45:06 +00:00
Matt Pietal
1664fe7849 Merge "Large clock positioning" into sc-dev am: 4719320ff6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15154904

Change-Id: I94e3add2e63af7b4c1087827a2b0792ab9e05238
2021-06-30 20:38:37 +00:00
Matt Pietal
969616a0bd Large clock positioning
- Better position the large clock to support various display
sizes. Specs call for centering minus a slight adjustment vertically.
- Make sure notifications don't run into the indication area. The
prior padding was too small.
- Ensure a smooth transition between lockscreen and bouncer
- Fix the smartspace with large clock to not interfere with the dock
settings icon

Fixes: 190047134
Test: manual (all display sizes)
Change-Id: I89e35eef35dc1d3d609b381f768779226962585f
2021-06-30 11:03:12 -04:00
Matt Pietal
3615d4b819 Merge "Lockscreen spacing to UX specs" into sc-dev am: e1ae3b743e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15049505

Change-Id: I3cc8f4ec22695d27db065d8244a3a84b7a7cd340
2021-06-22 17:03:10 +00:00
Matt Pietal
65b9b13465 Lockscreen spacing to UX specs
Reduce spacing between smartspace and notification area. Remove
concept of 'expanded clock position' from
KeyguardClockPositionAlgorithm, as it was only used when content was
vertically centered. Similarly, remove difference between
bypass/non-bypass height as the two layouts now match.

Fixes: 183008450
Fixes: 190831603
Test: atest KeyguardClockPositionAlgorithmTest
Change-Id: Ie274e34eb61a876166c11e4f4fa3b9d95ef49888
2021-06-21 15:37:48 -04:00
Michal Brzezinski
a34ae4718a Always showing big clock on the lockscreen in split shade
Big clock should be always visible on the left side of the lockscreen
in split shade mode, regardless of the number of notifications.

Bug: 190702873
Test: KeyguardClockSwitchTest and NotificationPanelViewTest
Change-Id: I7c4bb9684533f278f2014cf6fdf1b1b3f2e04515
2021-06-14 17:00:23 +01:00
Matt Pietal
507fe6f104 KeyguardClockPositionAlgorithm Test updates
Remove the concept of a 'preferred clock y'... not in use
anymore. Existing algo tests were designed around everything being
centered on the screen and isn't relevant. Update to reflect
everything being top-aligned.

Fixes: 190849712
Test: atest KeyguardClockPositionAlgorithmTest
Change-Id: I0a5fafb5ec36ffe6f98fdc6a44e46a65c821cc0c
2021-06-11 17:07:54 -04:00
Matt Pietal
dd42f85829 Update time format
When notified of a change in format or a change in user, issue a call
to update the time for both large/small clock.

Fixes: 189900109
Test: atest KeyguardStatusViewControllerTest
Change-Id: I5ccb55e74d26715fc5358bf9dcd95ff9257395bd
2021-06-04 15:42:50 -04:00
Matt Pietal
a2c5ff9b42 AOD/LS Clock fixes
Smartspace shared element transitions are interferring with normal
clock operation. Remove the offending lines until a proper fix can be
put in

Fixes: 189534613
Test: manual
Change-Id: Ib4678c1405dff722e57048885d8c3c5fb878c954
2021-06-01 10:48:52 -04:00
Matt Pietal
ba57dba13b Smartspace padding for AOD/LS
Update spacing, specifically to match the end padding for the
smartspace container. Reduce padding for the icon shelf to match
incoming changes for smartspace

Bug: 189363380
Test: manual
Change-Id: I82030e21cd5b77424b30dc3c634d01c73beac148
2021-05-27 15:24:37 -04:00
Josh Tsuji
3ec95514eb Merge "Adds the initial SmartSpace shared element transition!" into sc-dev 2021-05-27 00:29:00 +00:00
TreeHugger Robot
07791ca5bb Merge "Update smartspace when clock updates." into sc-dev 2021-05-17 22:36:27 +00:00
TreeHugger Robot
1c59631852 Merge "AOD icons should initially be invisible" into sc-dev 2021-05-17 21:24:06 +00:00
Josh Tsuji
2da469ffdf Adds the initial SmartSpace shared element transition!
To see this in action, enable the remote animation (adb shell setprop persist.wm.enable_remote_keyguard_animation 1) and enhanced SmartSpace (adb shell device_config put launcher ENABLE_SMARTSPACE_ENHANCED true). Also, set your lock mode to swipe or some sort of non-bypass biometrics, so you can swipe to unlock.
KIs:
- It looks pretty janky on a fast swipe - this is the same root cause as b/186847064 so will have the same fix
- Launcher animates in with window-level animations (Launcher team is looking into helping)
- Screen off animation is not yet implemented (this is for unlock only)

Bug: 187025480
Test: unlock with every possible permutation of lock settings
Change-Id: I8c186fe57132ebc9a0bc5e3d8785e753e72c3bf2
2021-05-17 16:07:58 -04:00
Alex Mang
78c33943f0 Update smartspace when clock updates.
This is needed so that calendar and other time based updates are still received when in doze mode.

Bug: 187186900
Test: KeyguardClockSwitchControllerTest, manually on device
Change-Id: I2667b722fbde219063c719296de35946f536473b
2021-05-17 11:22:20 -07:00
Beverly
acebac1d65 AOD icons should initially be invisible
Test: manual
Fixes: 186219378
Change-Id: I268273bf52a96638afae8de41fca5ac2b02ffd73
2021-05-17 09:01:29 -04:00
Beverly
f18b2894e4 Consider the clock detached if the keyguard isn't visible
Update AnimatableClockController's definition of attached to include
whether the keyguard is visible or not. This way, we won't animate
if the view isn't actually visible & we'll reset the clock state when
the keyguard is newly visible.

Only create a new AnimatableClockController onInit instead of
in the onAttach method for KeyguardClockSwitchController.

Fixes: 188203771
Test: manual
Change-Id: Id02132dba8b5392046cb46766aa64fd58e04a4ad
2021-05-14 16:22:18 -04:00
Matt Pietal
b40d4b4857 Smartspace - Animate vertically with clock change
When the large clock appears, move smartspace up to take the place of
the small clock. Reverse that when notifications appear and the small
clock shows up. Animate the large clock weight on appear.

Fixes: 185301988
Test: manual (swipe away notifications)

Change-Id: Ic293cebad4e7a5311c024a4d9cdc7b206689fde7
2021-05-13 16:19:46 -04:00
Ned Burns
7db37a067e Spin off smartspace behavior into SmartspaceController
Spins off the logic for manging the smartspace view into
LockscreenSmartspaceController. In addition to just cleaning things up,
this allows us to expose the current contents of the smartspace to any
listeners that might be interested (there's an interested listener in
the following CL).

Bug: 186481467
Test: atest
Change-Id: I117afdc984215128ec47dfd3190d1685757c0f69
2021-05-12 13:00:31 -04:00
Matt Pietal
10e70d9e58 Smartspace - Do not listen for user changes
The KeyguardClockSwitchController will already be recreated on a user
switch. This was adding a 2nd call, and then attempting reload
smartspace on a detached view.

Fixes: 187467770
Test: atest KeyguardClockSwitchControllerTest
Change-Id: I1f153c029481fe4915d42f7334cbb9534f89a42b
2021-05-07 10:37:40 -04:00
Matt Pietal
d5ea029ae6 Smartspace - Support Do Not Disturb
Add support for systemui to inform smartspace about do not disturb
settings. Address some minor spacing issues. Fix how smartspace loads
through dagger.

Fixes: 185970916
Test: atest KeyguardClockSwitchControllerTest
Change-Id: Id19244ceb45fb70a28d780fa5edefab35a5e42c4
2021-05-04 13:53:21 -04:00
Matt Pietal
5ab8c632b6 Smartspace - Check sensitivity settings
For both the current user and any managed profiles, check to see if
sensitive smartspace content should be filtered out, based on the user
settings.

Bug: 183401939
Test: atest KeyguardClockSwitchControllerTest

Change-Id: I5de56b1e3229629864304853c26dc45c98ef0114
2021-04-29 10:53:32 -04:00
Beverly
c8410aa9c2 Animate clock weight to 0 on bypass face auth
Test: manual
Fixes: 186631254
Change-Id: Ib9ceb4c23c06717404845535ee86987d7f43686f
2021-04-28 14:31:27 -04:00
Matt Pietal
de36555b9f Smartspace - Support launching intents from lockscreen
Also integrate the FalsingManager, which is important for determining
user intent while on the lockscreen.

Fixes: 186219857
Test: atest KeyguardClockSwitchControllerTest

Change-Id: I22108ec2335bd350fbcaf5d5b90dd3b351011767
2021-04-23 11:51:32 -04:00
Matt Pietal
7db0e2e381 Smartspace - Fade out secondary cards
Pass dozeAmount values to the smartspace library to allow the lib to
make decisions regarding content on both AOD and Lockscreen

Fixes: 185598979
Test: manual, multiple smartspace cards
Change-Id: Ic7bc2ba238b22794a33e6db18c1aae0fa7c96e0b
2021-04-20 16:36:27 -04:00
Shashwat Razdan
8c63ca6581 Addressing the feedback received in the API review.
API Review bugs list is here: https://b.corp.google.com/issues?q=blockingid:176851064

Test: CTS tests:

Fixes:185226923
Fixes:185226755
Fixes:185226674
Fixes:185226597
Fixes:185226790
Fixes:184585058
Fixes:184585080
Fixes:184585117
Fixes:184585343
Fixes:184585079

Change-Id: Idacee5f95ce104d1fb6de40a04ac2b74691f977e
2021-04-20 08:06:25 +00:00