summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Shows blurred thumbnail before fading to live previewChris Poultney2023-03-311-3/+11
| | | | | | Bug: 268066031 Test: manually verified blur display and fade to preview Change-Id: Idf6dc5a825f7541912a7bb891ce8f2b5b52aea9f
* Fades in preview of feathers to avoid flickerChris Poultney2023-03-312-1/+26
| | | | | | | | Bug: 268066031 Test: manually verified that fade has replace flicker for feather videos Test: manually verified that static wallpaper previews are unchanged Test: manually verified that other live wallpaper previews are unchanged Change-Id: I420ee05e631bba19453ed24671c504e31e8c5e60
* Merge "Update app grid options after changing grid" into tm-qpr-devChris Poultney2023-03-241-0/+1
|\
| * Update app grid options after changing gridChris Poultney2023-03-241-0/+1
| | | | | | | | | | | | | | | | | | Forces a reload of grid options after setting so that the new options are cached for next time the picker is launched. Fixes: 274929417 Test: manually verified that new choice is shown selected Change-Id: Ib21767a434891fba79b4c691ec488df9b861d73b
* | Merge "Use the same cropping for outer screen and unfolded vertical hinge" ↵TreeHugger Robot2023-03-243-4/+8
|\ \ | | | | | | | | | into tm-qpr-dev
| * | Use the same cropping for outer screen and unfolded vertical hingeAustin Wang2023-03-233-4/+8
| |/ | | | | | | | | | | | | | | Offset the preview to start if on handheld or unfolded horizontal hinge. Bug: 266436682 Test: set wallpaper on tablets, foldables w/ different screen config. Change-Id: If79a9e961e5570f7d10489c2c38d186615b00ee8
* / Revert and fix "Fix for color picker pager getting clipped"Catherine Liang2023-03-225-37/+14
|/ | | | | | | | | | | | | | This reverts changes in Iad0573c378c6234febb55d7c054e2bb5716b1107. Reverting change because CL created unexpected UI changes in the original color section UI on Pixel 7 & Pixel 7 Pro. This new solution was tested on a variety of devices and should fix the margin issues without introducing unexpected UI changes to other devices. Bug: 221762001 Test: Manually verified on multiple devices Change-Id: Ic9f54ca74aad136c6451b46249bd8ff8a8d42e66
* Merge "Fix for color picker pager getting clipped" into tm-qpr-devAbdullah Tabassum2023-03-165-9/+16
|\
| * Fix for color picker pager getting clippedabdullahirum2023-03-155-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | the color picker in the CustomizationPickerFragment is being clipped prematurely. This CL ensures that the clipping doesn't occur video before:https://drive.google.com/file/d/1_kOYPWubYrS0s_Z8mSNHqF4CF7t0gsi5/view?usp=share_link&resourcekey=0-PkqdGUzJ3FtZ_9iLqxJrkg video after:https://drive.google.com/file/d/14k4em_PXJmQqxQTFQDeCMRMTQHDpvGTI/view?usp=share_link&resourcekey=0-D6qXOJ2QBXIh7dyud-vtXQ Fix: 221762001 Test: manual Change-Id: Iad0573c378c6234febb55d7c054e2bb5716b1107
* | Merge "Color Picker Fragment UX Polish" into tm-qpr-devCatherine Liang2023-03-159-56/+55
|\ \
| * | Color Picker Fragment UX PolishCatherine Liang2023-03-159-56/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjustments to the header, bottom sheet tabs, subheader and color options to make sure they align with the most updated UX requirements. Also made sure common ItemSpacing is used. Before: https://screenshot.googleplex.com/8ZdxAhznKfP6K8z.png After: https://screenshot.googleplex.com/5CRw2g3abxpTQv8.png Bug: 269450711 Test: Manually verified new UI, made sure existing color picker unit tests still pass. Change-Id: Idb06ca5e7bf8b59ab21b34ffe1dbfb508f7a39e6
* | | Merge "Wallpaper Quick Switcher Reload (2/3)" into tm-qpr-devCatherine Liang2023-03-157-11/+83
|\ \ \
| * | | Wallpaper Quick Switcher Reload (2/3)Catherine Liang2023-03-107-11/+83
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that wallpaper preview and color section reload to show new wallpaper and new colors when a wallpaper in the wallpaper quick switcher section is selected. This was not the case when system colors is set to a basic color. Bug: 270193793 Test: Manually tested--wallpaper preview and colors reload when an option in wallpaper quick switcher section is selected, whether system color is set to a wallpaper color or a basic color, and made sure that there is no significant lag. Also made sure picker is unchanged and funactional with revamped UI flag turned off Recording - https://drive.google.com/file/d/1PEjnJPT2h2UfcWALxkYCFZmY8QMMj4rV/view?usp=sharing&resourcekey=0-jOw5CvSA5zacuvAeDTniMQ Change-Id: I2995f28ed7d0e7bc77ba43919ece81af7f66fc7f
* | | Grid Picker Selection Animation Fix (1/2)Catherine Liang2023-03-146-46/+98
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | Fix grid picker selection animation issue, due to comparison issues in diff util. Bug: 273336388 Test: Manually verified that grid picker, color picker, and quick affordance picker selection animation function correctly. Tested with print statements to verify diff util functions as intended. Updated field types in grid view model test. Change-Id: If48da6985ca99e254fbe511f2062a32e946883c9
* | System Colors picker selection animation (1/2)Catherine Liang2023-03-1317-118/+243
|/ | | | | | | | | | | | | | | | | Added selection animation to system colors by adapting color picker to use option item framework. Adjusted icon type used by option item framework to accomdate for color icons made up of multiple images. Animation on optimistic update can occasionally lead to animation being cut off due to restart, working with designers to resolve in follow-up CL Bug: 270188654 Test: existing view-model and interactor tests updated for field type changes, and still pass without logic changes. Manually verified picker is unchanged and funactional with revamped UI flag turned off. Manually verified animations, recording - https://drive.google.com/file/d/1BGFf9gyYMBKS9t8uLD1eQB4unb6Dv_z3/view?usp=sharing&resourcekey=0-IZFfkwrM9nmcgsD6RyW3lA Change-Id: I1e42106bb289c1d53eb63cd1b2288c4757564a73
* Use no-op snapshot store in restorers (2/2).Alejandro Nijamkin2023-03-086-6/+6
| | | | | | | | | | | | | | When the revamped UI flag is off, the undo system doesn't start a session, which means it doesn't hand a "store" to its restorers. By having all restorers start off with a safe-to-use no-op store, we circumvent a lot of crashes. Fix: 272157475 Fix: 271967027 Test: manually verified that the crashes no longer occur with the flag on or off and that the undo system (reset button) still works. Change-Id: I0a6e709d569ace7b2e8468e3f4810ae4f67a3b7d
* [TP] Get string arrayGeorge Lin2023-03-051-9/+7
| | | | | | | | Get string array from the resource Test: manually tested it's working Bug: 270097085 Change-Id: Ibb6a5ec16b59d41ae68a1c83d08f37ce26c8c64c
* Merge changes I288c3d8f,Ie6cb75ca,Iadb9ae77,Ib78058d0 into tm-qpr-devGeorge Lin2023-03-0413-94/+284
|\ | | | | | | | | | | | | | | * changes: [TP] Make clock previews tick [TP] Smooth scroll to clock color option position [TP] Use design clock colors [TP] Handle quick update from slider
| * [TP] Make clock previews tickGeorge Lin2023-03-033-0/+30
| | | | | | | | | | | | | | | | Make the clock previews tick with minute Test: Manually waited for the minute updates and saw clocks tick Bug: 270097085 Change-Id: I288c3d8ff50432b3eb9ca2cebabd2a8bbf5e3b21
| * [TP] Smooth scroll to clock color option positionGeorge Lin2023-03-032-0/+16
| | | | | | | | | | | | | | | | | | We should smooth scroll to clock color option position to make sure the selected option is shown on the screen. Test: manually tested that the selected color option shows on the screen Bug: 270097085 Change-Id: Ie6cb75cac2c07f72d0ae1937a9bf932be1dd2de7
| * [TP] Use design clock colorsGeorge Lin2023-03-037-89/+173
| | | | | | | | | | | | | | | | | | | | | | | | Use the clock colors approved from the designers. For each color, we have its min and max tone to tune. 1. Create ClockColorViewModel to represents a clock color config 2. Use string id to identify the selected color 3. Rename COLOR_TONE to COLOR_TONE_PROGRESS Test: manually test that the color tone works as expected Bug: 241966062 Change-Id: Iadb9ae773478008137413ad5873bb88f9a63b4b1
| * [TP] Handle quick update from sliderGeorge Lin2023-03-037-5/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When sliding, the color updates are frequent. We do not allow quick updates to the settings. So we will handle the color changes at the UI level. 1. Replace the clock preview on the lock screen with an overlay clock view 2. Implements the frequent color updates to the view Test: Manually tested that the view quickly respond to the slider Bug: 270097085 Change-Id: Ib78058d0dabaeea8cdbe1eed4516ecf02c76b904
* | Merge "[TP] Clock color updates" into tm-qpr-devGeorge Lin2023-03-047-109/+181
|\|
| * [TP] Clock color updatesGeorge Lin2023-03-037-109/+181
| | | | | | | | | | | | | | | | | | Support the update of the clock color. Clock color will change when a color option is selected. Test: Manually tested that the clock color can be updated Bug: 269203967 Change-Id: I5d7632e3d7ba14108ee9111f323edaa912c7bd6f
* | Handle the case of no grid options availableSantiago Etchebehere2023-03-035-28/+47
|/ | | | | | | | | Fixes: 271343879 Test: manually checked with a fake empty URI and added unit test in GridInteractorTest to test new behavior Change-Id: I95918b5a73711efb137cbcc35cea1a36324f25a6 Change-Id: I25b83eb5e31cbd0d27e1f599fc5aaa6018fdb20a
* Merge "Fix color picker section showing no wallpaper color on build" into ↵Catherine Liang2023-03-021-56/+79
|\ | | | | | | tm-qpr-dev
| * Fix color picker section showing no wallpaper color on buildCatherine Liang2023-03-021-56/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed separate wallpaperColorOptions and presetColorOptions flows in ColorPickerViewModel and combined into one. Because the original flows both transformed the interactor colorOptions flow and both fed into the final display options, they were making the flow run twice as many times as needed on build. In addition, they were causing inconsistent behaviors, like sometimes showing no color options on initial launch after a build. Bug: 269126622 Test: Manual, built and tested repeatedly to ensure wallpaper color options consistently display in color section, tested with print statements to observe the number of times a flow runs, ran ColorPickerViewModelTest to ensure it still passes Change-Id: I2bcb003b60c9a459967a41a9fb0d70b3ff110158
* | Merge "Separates home and lock wallpaper metadata" into tm-qpr-devChris Poultney2023-03-021-1/+1
|\ \
| * | Separates home and lock wallpaper metadataChris Poultney2023-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Tests will be added as follow-ups because test architecture changes are needed. Bug: 267479837 Test: added as follow-ups Change-Id: Ic849012f6f035b3189f9c9f4183fe92255df4be7
* | | [TP] Fix basic color is casted ColorSeedOptionGeorge Lin2023-03-011-24/+62
| |/ |/| | | | | | | | | | | | | | | Fix the exception that basic color is casted ColorSeedOption. It should be casted ColorBundle instead Test: manuelly tested that no crash when a basic color is selected Bug: 271284224 Change-Id: I8d8e6a9526d940fb3d2fa26bae0294efe97d7ba5
* | Merge changes Ide7d63a7,I9e075f29 into tm-qpr-devJordan Demeulenaere2023-03-016-9/+15
|\ \ | | | | | | | | | | | | | | | * changes: Format files with the upcoming version of ktfmt Regenerate include file for ktfmt upgrade
| * | Format files with the upcoming version of ktfmtJordan Demeulenaere2023-02-286-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL was generated automatically from the following command: $ external/ktfmt/prepare_upgrade.py --repo=packages/apps/ThemePicker/ --build_id=9645412 --bug_id=266197805 This CL formats all files already correctly formatted with the upcoming version of ktfmt. Bug: 266197805 Test: Presubmits Change-Id: Ide7d63a75fed98aabe348821355356c77f00a9ec Merged-In: Ide7d63a75fed98aabe348821355356c77f00a9ec
* | | Merge "[TP] Fix carousel missing" into tm-qpr-devGeorge Lin2023-02-282-6/+8
|\ \ \
| * | | [TP] Fix carousel missingGeorge Lin2023-02-282-6/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When coming back from a secondary screen, e.g. clock settings, shortcuts, the clock carousel is missing. This is to fix it. Test: tested that the carousel is shown when back from a secondary screen Bug: 271106023 Change-Id: Ifd1adf86a473efaaa5c11091ff3f60e94734a08e
* / / [TP] Get theme color as clock's default colorGeorge Lin2023-02-276-32/+72
|/ / | | | | | | | | | | | | | | The default color should show the theme color Test: manually tested that the default color shows the theme color Bug: 269212488 Change-Id: I2b89473c330931141e647463c1f904c17428afc7
* | Merge "[TP] Update the clock section title" into tm-qpr-devGeorge Lin2023-02-273-10/+32
|\ \
| * | [TP] Update the clock section titleGeorge Lin2023-02-243-10/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | The clock section title is udpated The subtitle should show the currently selected color and size Test: Tested manually https://screenshot.googleplex.com/6cc67JHK5gA3tgx Bug: 270208956 Change-Id: If35365330e4081bd5adedb9280c7ec4f4d438e9a
* | | Merge "[TP] Handle case for single default clock" into tm-qpr-devGeorge Lin2023-02-265-12/+73
|\ \ \
| * | | [TP] Handle case for single default clockGeorge Lin2023-02-245-12/+73
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | For the case that the phone only has the single default clock - Show the single clock on the preview Test: manually test that the color option is hidden Bug: 269631245 Change-Id: Iaa62ca98596eba343ec5a7bb30a5d8a5402e8599
* | | Revert^2 "Color Picker reset support (1/3)"Catherine Liang2023-02-2411-146/+281
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resubmit change after revert b/270700133 Original CL: I27f47621e2f187449b1642ed0794c63efef9d37f Adjusted to add null check in ColorCustomizationManager and ColorPickerRepositoryImpl Bug: 267803746 Bug: 269339630 Bug: 269451870 Test: Manual tests including changing wallpaper to verify that color options are updated, setting system color, setting and resetting color with a combination of wallpaper and basic colors, resetting after making changes to both wallpaper and color option Change-Id: I4b1cc3e6ad7caeb82fe0cb033d6ec6283d2f6759
* | Revert "Color Picker reset support (1/3)"Sam Dubey2023-02-2410-283/+144
| | | | | | | | | | | | | | | | | | | | Revert submission 21444777-wpp-color-picker-reset Reason for revert: b/270700133 Reverted changes: /q/submissionid:21444777-wpp-color-picker-reset Change-Id: I95762abc080f684e698405d55d7df2ee46d406d1
* | Color Picker reset support (1/3)Catherine Liang2023-02-2210-144/+283
|/ | | | | | | | | | | | | | | | | Add color picker reset support. Refactored WallpaperColorsViewModel as well to be provided from the WPP2 injector rather than from the ViewModelProvider. This CL also moves optimistic update from the repository layer to the interactor layer. Bug: 267803746 Bug: 269339630 Bug: 269451870 Test: Unit tests, and manual tests including changing wallpaper to verify that color options are updated, setting system color, setting and resetting color with a combination of wallpaper and basic colors, resetting after making changes to both wallpaper and color option Change-Id: I27f47621e2f187449b1642ed0794c63efef9d37f
* [TP] ClockRegistry do not wait for plugin manager connectedGeorge Lin2023-02-2111-328/+66
| | | | | | | | | | | | | | We no longer need to wait for plugin connected to use the clock registry since we can now directly listen to clock list updates from the clock registry. 1. Remove the suspend func in ClockRegistryProvider 2. Remove all the related providers that wait for the clock registry to be ready Test: Manually test that the clock carousel shows as expected Bug: 269656371 Change-Id: I73fe5e4222105916cee2a4c489ad915d40459373
* Merge "[TP] Make all clocks a flow" into tm-qpr-devGeorge Lin2023-02-219-58/+114
|\
| * [TP] Make all clocks a flowGeorge Lin2023-02-219-58/+114
| | | | | | | | | | | | | | | | | | | | | | | | 1. From the clock registry we only have callbacks when clock list udpates. We need to have a flow instead of a one-off query which can possibly get list of only 1 clock because we query too early. 2. Decbounce the upstream signals to avoid multiple unnecessary updates of the carousel adapter Test: tested that the clock carousel shows with all the clocks Bug: 269656371 Change-Id: I63ef8ba62a32499f8213ef9d126e85fb211ce19e
* | Merge "[TP] App grid support for reset (3/4)." into tm-qpr-devAle Nijamkin2023-02-1813-26/+836
|\ \ | |/ |/|
| * [TP] App grid support for reset (3/4).Alejandro Nijamkin2023-02-1613-26/+836
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL chain provides a rewritten implementation of the UI for the app grid selector which supports the new wallpaper picker "reset" functionality. A previous attempt that kept the UI's old implementation required the introduction of many hacks in classes that are shared across multiple selector-like experiences. Bug: 267804479 Test: unit and integration JUnit tests added for the data, domain, and ui layers of the wallpaper picker code Test: manually made sure that the selector works to switch between different launcher app icon grid options; the preview of the launcher updates correctly; when exiting back to the main wallpaper picker screen, the reset button appears and the section item is updated to show the currently-selected option; touching the reset button and confirming the reset correctly reverts to the original option, updating the section item as well Change-Id: I911e337c0d2f02dc5d794f31a4621c20e02e8f1a
* | [TP] Remove clock carousel on clock settings screenGeorge Lin2023-02-161-19/+0
| | | | | | | | | | | | Test: Manually tested that the clock carousel is gone Bug: 262924055 Change-Id: Ia33559e80e64a6d469e164b134a8e2db856ceb70
* | Merge "Color Picker Fragment Dark Mode Toggle (1/2)" into tm-qpr-devCatherine Liang2023-02-163-7/+14
|\ \
| * | Color Picker Fragment Dark Mode Toggle (1/2)Catherine Liang2023-02-153-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move dark mode toggle from the customization hub landing page into the color picker page, gated by revamped UI flag. Currently the dark mode section controller is kept and used in the color picker page, but this can be refactored in the future. Bug: 269449457 Test: Manual Change-Id: I2669cee07fa81fcd8c436a30c511bae66aa50a29