Commit Graph

72 Commits

Author SHA1 Message Date
Darrell Shi
34db15a008 Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev 2023-03-17 15:47:23 +00:00
Lucas Silva
4ace76e6c2 Add home controls button to screensaver settings
Toggle will allow users to disable showing home controls over their
screensaver.

Bug: 271330583
Test: make -j64 RunSettingsRoboTests
Change-Id: I9600cdb85d85253c859c88f12c1d074e1082bf97
2023-03-09 14:58:26 -05:00
Will Leshner
3358e2a0a1 Restrict screen saver settings searches to enabled users.
If a user can't enable screen saver, they shouldn't be able to
accidentally find screen saver related settings in Settings.

Bug: 260276394
Test: atest ScreenSaverPreferenceControllerTest
Test: manually by settings up a second user on a device that supports
screen saver, switching to that user, and making sure that searches for
"screen saver" don't accidentally reveal settings that can't be
accessed.

Merged-In: If2f465b2acb548455f0868507cf47217ea1a626f
Change-Id: I96fb8f9c6c4960f203b51bb43994f7bafdcefdf5
2023-02-27 10:20:05 -08:00
Weiyue Huang
1b6ab7ec90 Prevent the screen reader box from unexpected scrolling in dream setting
page.

Bug: 228355186
Test: manual
Change-Id: I66a70d6b12bd3a2766e6879cb27c68a851d1dd87
Merged-In: I66a70d6b12bd3a2766e6879cb27c68a851d1dd87
(cherry picked from commit edfd262be2)
2023-02-23 03:16:00 +00:00
Darrell Shi
86113ae01f Hide "additional info" when active dream does not support.
Only show the "additional info", which displays dream complications,
when supported by the user selected dream.

Test: make -j86 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.dream.DreamSettingsTest"
Test: verified on device switching between different dreams
Bug: 223860510
Fix: 223860510

Change-Id: I63872ea9ab9f42be47f8e2f7c3835b55056e6588
2023-02-17 00:40:02 +00:00
Lucas Silva
ca65b6e5ba Add content description to screensaver customization button
This will let users know which screensaver they are customizing.

Fixes: 267582102
Test: flashed device and enabled talkback, opened screensaver settings,
and verified talkback correctly says the name of the screensaver

Change-Id: I9d0d9422f06b7a78efca0e6953b73fe612f79e2a
2023-02-03 15:27:26 -05:00
Darrell Shi
d1f5edfc78 Update screensaver preference summary when on.
The summary for screensaver preference is updated to, e.g. "On / Art
gallery".

Bug: 261907383
Test: 'make -j64 RunSettingsRoboTests \
ROBOTEST_FILTER="com.android.settings.dream.DreamSettingsTest"'

Change-Id: I40483f266c42a6e49e513208ba513d469d67f85a
Merged-In: I40483f266c42a6e49e513208ba513d469d67f85a
2022-12-09 17:36:01 +00:00
Lucas Silva
47d84b41ac Update the "When to dream" settings
For devices which don't support dreaming on battery, we can offer
simpler options since the device must always be charging for
screensavers to appear. Therefore there are only two options:

1. While charging
2. While docked and charging

Test: flashed and verified on device
Test: make -j64 RunSettingsRoboTests
Fixes: 226187572
Change-Id: I6ed24cda8874f2fb941f6cfded9ed97ed78a3cb6
2022-10-28 13:07:36 -04:00
Lucas Silva
51f838ba4b Update dream summary when dream suppressed by bedtime mode
Bug: 246472225
Test: enabled bedtime mode, verified settings summary updated
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.WhenToDreamPreferenceControllerTest"
Change-Id: I4de12f636975b1bdf36898f7a530fde2f55644d4
2022-10-18 13:23:49 +00:00
Victor Truong
00b3a5cdb6 Add NoDreamViewHolder for a different layout for NoDreamItem.
Bug: 243389115
Test: Manually tested
Change-Id: Id7549d55721c474cf8baddc0b336fe3600ccb5e3
2022-09-16 11:59:44 -04:00
Xiaowen Lei
3d41a009c8 Set page_id when logging ACTION_DREAM_SELECT_TYPE.
To differentiate from the same action logged on other pages.

Bug: 243553826
Test: on device via statsd_testdrive
Change-Id: If722e8ffa417aac11d92e7519d89bd459ddc5eeb
2022-08-25 23:48:36 +00:00
Lucas Silva
059154ebb2 Update dream complication settings to use boolean setting.
This simplifies the logic and prevents the boolean from toggling itself
when new complication types are added.

Bug: 241469874
Test: manually on device
Change-Id: I0b67f9f2ce75dcfc5e57a50f9b27e374ea9295b1
2022-08-22 16:22:53 -04:00
Lucas Silva
e2ef52d6f1 Update dream settings logic to keep the customize button unselected.
Test: manually on device
Bug: 227717835
Fixed: 227717835
Change-Id: I4d796c3b7510baf07a670347fe4112a0b95d3036
2022-04-29 20:43:20 +00:00
TreeHugger Robot
dc8b0a5e2d Merge "Update dream settings categories, to fix padding." into tm-dev 2022-04-14 21:21:22 +00:00
Lucas Silva
d8b90650d3 Update dream settings categories, to fix padding.
The extra PreferenceCategory is adding some unnecessary padding, so
removing it. Instead of using a preference category to enable/disable
all items, we just iterate through all the preferences when
enabling/disabling items.

Bug: 227139218
Test: locally on device
Change-Id: I403295fbccb7b135b7d603cd1fc713c4c0189569
2022-04-14 18:59:53 +00:00
Victor Truong
05e824e9e0 Set Active dream to not be clickable when active.
Setting Active dream to not be clickable to stop Talkback from prompting
user to "Double tap to activate".

Bug: 228573813
Test: Manually tested on device.
Change-Id: I5f646bcf82d8c4172127f0739b6c0d7af890dabb
2022-04-14 17:38:26 +00:00
Victor Truong
cd11aa887a Disable dream highlight when screensaver is disabled in Settings.
Bug: 228329639
Test: Manual
Change-Id: Ic6d9664cc800c28327fbcaa1628bb518c07354f2
2022-04-12 13:23:10 +00:00
Lucas Silva
94716a5d58 Always set the customize button in dream settings to not selected.
This will prevent screen readers from saying the button is selected when
the outer container is selected.

Bug: 227717835
Test: locally on device
Change-Id: Ic7b4a36eb3b79ff847909ab6fcbd984eaf93d618
2022-04-08 15:34:06 +00:00
Xiaowen Lei
8708bbd8b3 Merge "Update the function used to log the dream picking events." into tm-dev 2022-04-06 15:04:57 +00:00
Lucas Silva
f7a95e4b5d Fix bug where not all views are getting disabled alpha applied.
This ensures that we apply the alpha recursively to all views when the
item is disabled/enabled.

Bug: 226573932
Test: locally on device
Change-Id: I28ee1a21227706d01a6e4f6284871bf78af983f5
2022-04-04 17:32:05 -04:00
Xiaowen Lei
f3dce9d7d4 Update the function used to log the dream picking events.
The behavior is identical to before (for StatsLogWriter), but switching
to the generic function with the appropriate field names.

Bug: 213906448
Test: on device via `statsd_testdrive 97`
Change-Id: I241d110b531567cb828a2ed849c79b6595a4b4d1
2022-04-01 15:28:20 +00:00
Lucas Silva
d9071dea25 Add master toggle to enable/disable screen savers
The new control toggles the Settings.Secure.SCREENSAVER_ENABLED setting,
which controls if a screen saver is enabled. Also removed the "Never"
option from the WhenToDream picker, since this is now controlled via the
toggle.

Test: locally on device
Bug: 222360260
Change-Id: Ibcf52b5e2d1ad0c295f32c4c18bfc89082d074ce
2022-03-08 10:27:59 -05:00
TreeHugger Robot
ccf275d55c Merge "Apply proper icon tinting to dream icons" into tm-dev 2022-03-05 00:53:57 +00:00
Lucas Silva
cf7338c1cf Apply proper icon tinting to dream icons
Test: locally on device
Bug: 222754771
Change-Id: I2998a37db4221f6beaeca591532ccc35d0992b86
2022-03-04 17:50:56 -05:00
Lucas Silva
eddf2b1345 Fix bug where dream preview image s not reset.
When the view is recycled, there may be an old preview image in the view
which should be cleared.

Bug: 222705951
Test: locally on device
Change-Id: I4bb1c176a9a6d04fd41780fa2da09ca685b87d26
2022-03-04 15:35:26 -05:00
Lucas Silva
9548af2cc8 Change dream icon color to be the same as the text color.
Bug: 220120729
Test: locally on device
Change-Id: I60de6ba18c0ee46fa1e578e8a7b4c68206024913
2022-02-25 13:39:43 -05:00
Lucas Silva
5e91b7eab3 Allow other layouts to be passed into the dream view adatper.
This will let the OOBE flow use a different layout than the regular
Settings view.

Bug: 221227402
Test: locally on device
Change-Id: I27545b7dad1d789adcae8589480d29bc5231c98c
2022-02-24 16:45:03 +00:00
Lucas Silva
c7709aebb3 Add dream descriptions to dream settings UI.
The dream descriptions will now be shown underneath the title, if the
dream has provided one.

We also cleaned up the icon view, instead merging it with the title view
to ensure proper alignment between the icon and title.

Bug: 221078654
Test: locally on device
Test: atest DreamPickerControllerTest
Change-Id: I00fd69c294f1a5fbcbc5392eba342f2896f6d9ed
2022-02-24 16:25:24 +00:00
Lucas Silva
5e1fc317aa Merge changes from topics "dreams-phone", "dreams-preview-placeholder"
* changes:
  Add default placeholder when a dream doesn't provide a preview image.
  Update default dream settings dimens for phones.
  Update dream settings UX to match latest mocks.
2022-02-15 20:00:13 +00:00
Lucas Silva
1bce5eb511 Add default placeholder when a dream doesn't provide a preview image.
Bug: 213887094
Test: locally on device
Change-Id: Ie4b96eadb0889a5216cda1cfe1cf0cc17a2ad652
2022-02-15 17:34:42 +00:00
Lucas Silva
75c44cd02b Update dream settings UX to match latest mocks.
Updates:
- removed individual complication toggle
- added single toggle which enables/disables all supported complications
- updated colors to match mocks
- updated grid padding in order to line up with existing content. Note:
  this required more complex padding logic, using an item decorator to
  apply the padding only to inner grid elements.
- updated preview image, removing view nesting to make better use of
  ConstraintLayout
- Updated some strings to match mocks

Test: locally on device
Bug: 217555053
Change-Id: I573e5f4ed807cbe2ae9e00f183d402e6e3339590
2022-02-15 17:32:01 +00:00
Treehugger Robot
4d392d17ea Merge "Fix dream settings OWNERS path" am: c6bf492db4 am: 58fb784e7d am: a3102c477f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1985346

Change-Id: I4561e6b084a48159d338b61e1b88ec7365527543
2022-02-15 01:18:07 +00:00
Treehugger Robot
58fb784e7d Merge "Fix dream settings OWNERS path" am: c6bf492db4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1985346

Change-Id: Ifeb24520760d02cefc9ab12ff648203dbd2a988b
2022-02-15 00:42:12 +00:00
Lucas Silva
55ce0f7cdd Fix dream settings OWNERS path
Change-Id: I4ebcec52d96cee03448a872984036c314c760eaa
2022-02-14 17:02:16 +00:00
Lucas Silva
3eb4cb41ae Move Dream OOBE activity to SettingsGoogle
This will only be used on pixel devices.

Bug: 217555049
Test: locally on device
Change-Id: Ica7cddae8b8b8693a83da95d25a8d0827aed0945
2022-02-11 16:22:54 +00:00
Lucas Silva
12945af711 Implement floating dream preview button.
Bug: 217556080
Test: locally on device
Change-Id: If76dce6a250fc5fc37d26fc3d7a31775333055d7
2022-02-10 20:42:12 +00:00
Lucas Silva
06e373dcb0 Add oobe dream settings activity
This activity will be displayed during the deferred setup wizard flow

http://recall/-/eh4NkVnIpkjUSU9uGPTn1S/dxeTM32hyJXN3nDKsRQfrZ

Test: locally on device
Bug: 215651884
Bug: 216195180
Change-Id: I9d8eef411a190cdbfc1a33d1bbbee61338ddd154
2022-02-01 19:10:16 +00:00
Lucas Silva
f0f7adc612 Implement dream complication settings.
This component allows the user to select dream complications to
enable/disable.

Bug: 215703483
Test: locally on device
Change-Id: I03dd9d67b4aeb3f41885b42391d97c18bd7465f6
2022-01-28 17:32:36 +00:00
Lucas Silva
55df7acc51 Dream settings refactor.
We will be re-using the grid UI for the dream complication picker, so
this change refactors some of that logic so it can be re-used in the
complication controller.

We also update some of the UI here to match the most recent UX
decisions.

http://screen/BxhAwZwQSVoxUmN.png

Test: locally on device
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.DreamPickerControllerTest"
Bug: 214250590
Bug: 215703483
Change-Id: I9fbfa0f0cd31ae3d119c7cd1a9562d4cdb203d6c
2022-01-27 19:51:32 +00:00
Xiaowen Lei
b11d8a44c9 Log user action for selecting dream.
Test: on device via statsd_testdrive
Bug: 213906448

Change-Id: Ida57a6755054c0741f3fb0c2222425535150fb5a
2022-01-25 22:20:39 +00:00
Lucas Silva
38d0a7ca91 Rewrite dream settings.
The available dreams will now be shown in a grid, with a preview button
at the bottom.

Screenshot (white placeholder image used):
http://screen/6pe6EoACPoQN8TZ.png
http://screen/4nR6Wg5pN7pL6Wb.png

Phone (single column layout):
http://screen/4WFqzZR8Yf9H3VZ.png

Colors and margins will be finalized once final mocks are done.

Bug: 207681076
Bug: 214250590
Test: locally on device
Change-Id: Ie68bdc60e74e72dc3c3cee3f1ffd40f5613109b9
2022-01-18 16:06:34 +00:00
Stanley Wang
446f6dd886 Restore the style of the screen saver widget from switch style to
button style.

The operation of the Switch is not suitable for previewing the
screen saver and will make the user confused. So we change the
style of the screen saver widget back to the button style.

Fix: 189505023
Test: manually test the screen saver
Change-Id: I4a97d91cc0b76111d4cb7b6aa202f2207ee0ca5d
2021-12-22 10:13:27 +08:00
Jason Chiu
2989c50a23 Add highlight menu keys for all toggle pref controllers and custom slices
Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: Iad2e28ada8ddb766ffa7eff2c8dc581250cbd6f8
2021-11-01 15:00:18 +08:00
Stanley Wang
f2c664abd9 Guard the NPE on StartNow slice
Check if preference is null to avoid NPE when the StartNowPreferenceController
is called by slice.

Fixes: 187806890
Test: robotest
Change-Id: I84c1ee42bc1fd87dd720061e3af81e926028181d
2021-05-14 07:38:41 +00:00
Stanley Wang
9b906cb5b6 Use MainSwitchPreference on Bubbles, Screen Saver and
One-Handed mode pages.

Fixes: 178679876
Fixes: 177968619
Test: robotest and see the UIs.
Change-Id: Ic62c7464a71e5410ece5d1db7578c522e1babedc
2021-05-04 19:31:29 +08:00
jasonwshsu
9b284a9af1 Wrap a white adaptive background if it is not an AdaptiveIcon
Bug: 183501919
Test: manual test
Change-Id: I6a899aa0fcb724d5318274190f359080fc2d0615
2021-04-26 05:01:00 +00:00
Mill Chen
c91a8bce5b Add icon to current screen saver preference
The screen saver setting is coming from different apps to modify
their options. This will confuse people that they were modifying
something in Settings rather than in other apps. To improve that,
we added an icon of active dream and put it on the left side of
current screen saver setting, which is to let people clearer to
know that they were modifying the options in other apps.

Bug: 129994275
Test: robotests
Change-Id: I014c9de745044c2bd39d22782b6c36f8605d8f56
2020-04-28 17:09:01 +08:00
Jason Chiu
b12e3b96c9 Support click metrics logs in several pages
- Assign metrics category to perferences at an earlier stage in
  DashboardFragment for better usability.

Bug: 137559984
Test: robotest
Change-Id: Icd4185efa0e655be20c4b673a1380fa42140923f
2020-04-07 16:44:53 +08:00
Jason Chiu
26343b82ee Add metric logs for special cases in Display and Battery page
Bug: 137559984
Test: robotest
Change-Id: I60f6237ac2c533306879f46ee4c25d54002cf0e9
2020-03-26 11:31:39 +08:00
Edgar Wang
e19ee9a01f Revert "Settings search - Navigate user to exact page"
This reverts commit 08f2a58459.

Reason for revert: design changed, we decide to take the user to
the entry after clicking on a search result.
It's opposite with what we did, so we revert related CL first.

Test: robotest

Change-Id: Iadb9a94a7ef7838be34a54499e2d934d6396c336
2020-01-16 14:07:38 +08:00