summaryrefslogtreecommitdiff
path: root/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
AgeCommit message (Collapse)Author
2022-03-15Merge SP2A.220305.013Haamed Gheibi
Bug: 220074017 Change-Id: Idfdd94e902f656ac65a2a75dfdd199f6f85ba472
2021-10-06Update dozing state on clock view attachedBeverly
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-09-27Update clock burn-in so it doesn't clash with udpfsBeverly
* 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-08-12Limit keyguard views on alt displaysMatt Pietal
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-07-07Bring back time formatting for single line clockBeverly
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-06-30Large clock positioningMatt Pietal
- 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-21Lockscreen spacing to UX specsMatt Pietal
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-11KeyguardClockPositionAlgorithm Test updatesMatt Pietal
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-04Update time formatMatt Pietal
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-01AOD/LS Clock fixesMatt Pietal
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-05-27Smartspace padding for AOD/LSMatt Pietal
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-27Merge "Adds the initial SmartSpace shared element transition!" into sc-devJosh Tsuji
2021-05-17Merge "Update smartspace when clock updates." into sc-devTreeHugger Robot
2021-05-17Merge "AOD icons should initially be invisible" into sc-devTreeHugger Robot
2021-05-17Adds the initial SmartSpace shared element transition!Josh Tsuji
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-17Update smartspace when clock updates.Alex Mang
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-17AOD icons should initially be invisibleBeverly
Test: manual Fixes: 186219378 Change-Id: I268273bf52a96638afae8de41fca5ac2b02ffd73
2021-05-14Consider the clock detached if the keyguard isn't visibleBeverly
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-13Smartspace - Animate vertically with clock changeMatt Pietal
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-12Spin off smartspace behavior into SmartspaceControllerNed Burns
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-07Smartspace - Do not listen for user changesMatt Pietal
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-04Smartspace - Support Do Not DisturbMatt Pietal
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-04-29Smartspace - Check sensitivity settingsMatt Pietal
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-28Animate clock weight to 0 on bypass face authBeverly
Test: manual Fixes: 186631254 Change-Id: Ib9ceb4c23c06717404845535ee86987d7f43686f
2021-04-23Smartspace - Support launching intents from lockscreenMatt Pietal
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-20Smartspace - Fade out secondary cardsMatt Pietal
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-20Addressing the feedback received in the API review.Shashwat Razdan
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-15Removes System UI plugin for BC Smartspace.Andy Wickham
Uses BcSmartspaceDataProvider directly instead. Bug: 185416581 Test: Manual and with updated unit tests Change-Id: I42049c037e95a6c544dc8e841890f8d1981c124a
2021-04-14Smartspace - Allow primary card colors to be updatedMatt Pietal
This is largely for both AOD and lockscreen, while may have different colors than launcher. Particularly for AOD, we need to transition to a WHITE color. Set a primary text color, with expectations that a secondary color will later be set in order to support cards with various background colors. Fixes: 185211979 Test: manual, change to AOD <-> LS Change-Id: I36fb8e5cfcbac1ec999b2b9df08f42d47507990f
2021-04-13Smartspace - Align large clockMatt Pietal
The large clock was not properly set below the new smartspace when the plugin was activiated. Fix that. Fixes: 185226009 Test: atest KeyguardClockSwitchControllerTest Change-Id: Ib9c1f837128524b8a896ed12eee7b70cc145ec28
2021-04-12Animate LockScreen and AOD clock text for charging eventsShan Huang
Test: Manual Bug: 182719493 Change-Id: I57f7cd834a08d8846a35cdf731611fc7a239b85a
2021-04-12Update to latest UX margins for clock... and much moreMatt Pietal
Remove old style clocks and all related code. Begin unraveling code supporting multiple layouts. Migrate plugin small/big clock support to the new clock areas. Fixes: 184073275 Test: atest KeyguardClockSwitchTest KeyguardClockSwitchControllerTest Change-Id: I38dc2a6df6a710c6da23cbb17fac8d28f3b84764
2021-04-10Revert^4 "Enable smartspace"Matt Pietal
20744ed3b4623b379821af2945ef0cb77fe40648 Change-Id: I1eba412c6cb31684760af068b86a602cf6a53578
2021-04-08Revert^3 "Enable smartspace"Matt Pietal
3b67a00d95e6d19824030cd1169e213c2231ce71 Change-Id: I4711f24b1ed3535dbf40ffd6ab893e6cd661fe49
2021-04-07Revert^2 "Enable smartspace"Matt Pietal
Address issue with component init and tests Bug: 184642387 Test: com.android.devicehealthchecks.SystemAppCheck Change-Id: I51ad3fb2e9df47a8f426a356fc34c8499b94892f
2021-04-06Revert "Enable smartspace"Ulyana Trafimovich
Revert "Enable smartspace" Revert submission 13984710-smartspace_ls Reason for revert: Broken test: com.android.devicehealthchecks.SystemAppCheck#system_app_crash on git_master on redfin-userdebug at 7262114 Reverted Changes: I77a4ef72c:Enable smartspace I77a4ef72c:Enable smartspace Bug: 184642387 Change-Id: I299bef5e730c632803c56cf0f1cd858caac4e49f Test: forrest run for the broken test
2021-04-05Enable smartspaceMatt Pietal
Allow KeyguardSliceProvider to be replaced by content coming from the BcSmartspaceDataPlugin, only when the plugin is enabled. Bug: 172360102 Test: manual Change-Id: I77a4ef72c7131f955fe37763e02542726c36927b
2021-02-19AOD/LS - Move clock to startMatt Pietal
Move clock to the start, and move smartspace content below it. Recalibrate burn-in and fully support RTL layouts. Remove extra top margins. Bug: 172360102 Test: manual Change-Id: I2dc4300106c63095ae41f9407b2fe4c053017573
2021-02-09Update LS/AOD clockBeverly
- only use one paint for hours and minutes - customize vertical line spacing for Burmese numerals to account for long ascenders and descenders Note: Burmese numerals sometimes get cutoff at the bottom, bug filed at b/179815528 Test: manual Fixes: 177206446 Bug: 179781576 Change-Id: Iac71eabdcf1ed06962f38414253a2038651168c7
2020-12-17AOD/LS - Large clock animationsMatt Pietal
Match latest specs for large/small clock transitions, including a fade and y-axis shift. Bug: 172360102 Test: manual, show/hide all notifications Change-Id: I8d756bfbc524481d7b8835946acf05aa4893a1d5
2020-12-03Update AOD/LS clockBeverly
- Update clock sizes (large clock = 200dp, small clock = 100dp) - Update clock weights (large = 100-400, small = 200-300) - Update clocks on time zone and time format changes (Settings > System > Date & Time) Test: manual, atest SystemUITests Bug: 170228350 Change-Id: I446a2625fdd776c15e744f1601b3ea0e2a873cf1
2020-12-01AOD - Scale large clock for burn-in protectionMatt Pietal
Scale the AOD large clock between [0.8, 1.0] in both x,y directions, in order to keep the clock centered. The large clock will still be shifted on the y-axis as well. Bug: 13129102 Test: manual, burn in tests Change-Id: I86235d39b199a1a10cfb40e474f1e1e58b9c11d8
2020-11-19AOD - Large clockMatt Pietal
Support large clock when no notifications are present. Remove immediately when a HUN appears. Bug: 172360102 Test: manual Change-Id: I7ed4689b4d1d4176e0a4a29fc61150905037f484
2020-11-17Update spacing/layout of LS clockBeverly
- Only use the burn-in offsets on AOD. This means the clock will be in a different position on LS compared to AOD. - Align the top of the KeyguardSliceView (smart space) with the top of the text of the clock (as opposed dto the top of the clock's view) - Decrease bottom padding on KeyguardSliceTextView so that the DND icon doesn't get cutoff when there's a large smart space info Test: atest SystemUITests, manual Bug: 170228350 Change-Id: I332300616e4218b6fcd24f837127a7eee487d4e7
2020-11-17Add support for LS Clock to use > 1 Paint objectBeverly
Updated TextInterpolator and TextAnimator to support a Paint object for each line of text. Now we can interpolate between the colors when animating. Clock colors are now based on the theme (for now, wallpaper text color). ie: first line (of vertical clock) is one color, second line is another color. Also adjusted Keyguard clock logic to animate on doze changes instead of animating incrementally on setDarkAmount. Test: atest TextInterpolatorTest TextAnimatorTest Bug: 170228350 Change-Id: Ia62f2de48534be2007afc5a95eac46b3c44ec880
2020-11-04AOD - Burn in adjustmentsMatt Pietal
Move both the clock and keyguard slice area towards the middle for x adjustments, and retain the current Y adjustments. Bug: 172360102 Test: follow burn in instructions here: /frameworks/base/packages/SystemUI/docs/clock-plugins.md Change-Id: Id22d777724bf9be58758b1a2b260a7933af8e999
2020-10-23Merge "Uncenter aod icons for new lockscreen"TreeHugger Robot
2020-10-23Uncenter aod icons for new lockscreenBeverly
Also moves setup of aod icons to KeyguardStatusViewController instead of through Status Bar => NotificationPanelViewController. To enable the new lockscreen (value = 0 is disabled, value = 1 is enabled): adb shell settings put global show_new_lockscreen <value> Test: atest NotificationIconControllerTest Test: atest SystemUITests Bug: 170228350 Change-Id: I93d19823620051e969e8790c8946bdc15a5ab379
2020-10-23Change ViewController#initInternal to #onInitDave Mankoff
Bug: 171472009 Test: manual Change-Id: Iddc6c0240486b0d3005216bba0c40bfb481b94b3
2020-10-22Add initInternal to ViewController.Dave Mankoff
ViewController's init method was not ideal to override. On the one hand, if you put a call super.init() first your onViewAttach method is called before you're subclass's init. Further, if you put your own code befer super.init(), you are still left with the problem that your init is not automatically idempotent, and multiple calls to #init() could result in multiple executions of your code unless you handle it yourself. With this change, #initInternal() is introduced, giving ViewControllers a place to put their run-once code such that it runs before any view-attachment callbacks are fired. Fixes: 171472009 Test: manual Change-Id: I2e284024c82e3f7c7b6f29f22a1ffa3c8aae9fcb